Index: APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijAfhandelaar/DKG.cls.xml
===================================================================
diff -u
--- APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijAfhandelaar/DKG.cls.xml	(revision 0)
+++ APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijAfhandelaar/DKG.cls.xml	(revision 31323)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.DKG">
+<Super>APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.Base</Super>
+
+<Method name="%OnNew">
+<FormalSpec>Verstuurder:APPS.OV.OrderBevestiging.OrderBevestigingWachtrijAfhandelaar.Verstuurder</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..Verstuurder = $$$Implementation(Verstuurder, ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.Verstuurder.DKG).%New())
+	
+	quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefKlantID">
+<Private>1</Private>
+<ReturnType>DOM.common.PartijID</ReturnType>
+<Implementation><![CDATA[	quit ##class(DOM.VKP.enu.Klant).DKGDeKeukenfabriek()
+]]></Implementation>
+</Method>
+
+<Method name="GeefExtraOmschrijvingVoorOrderVerwerkingException">
+<Private>1</Private>
+<ReturnType>TECH.String</ReturnType>
+<Implementation><![CDATA[	quit "OrderBevestigingWachtrijAfhandelaarDKG"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhCARETAKER.mac.rou
===================================================================
diff -u -r29657 -r31323
--- vhCARETAKER.mac.rou	(.../vhCARETAKER.mac.rou)	(revision 29657)
+++ vhCARETAKER.mac.rou	(.../vhCARETAKER.mac.rou)	(revision 31323)
@@ -812,17 +812,22 @@
 	}
 	Quit
 	
-BevestigEDIOrdersBruynzeel ; Bevestig EDI-orders voor Bruynzeel
+BevestigEDIOrders(Afhandelaar)
 	try {
-		set QueueAfhandelaarBruynzeel = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaarBruynzeel).%New()
-		do QueueAfhandelaarBruynzeel.VerstuurBevestigingen()
+		do Afhandelaar.VerstuurBevestigingen()
+	} catch (Exceptie) {
+		do OnError
 	}
-	Catch (Exceptie)
-	{
-		Do OnError
-	}
-	Quit
+	quit
 	
+BevestigEDIOrdersBruynzeel ; Bevestig EDI-orders voor Bruynzeel
+	do BevestigEDIOrders(##class(APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.Bruynzeel).%New())	
+	quit
+	
+BevestigEDIOrdersDKG ; Bevestig EDI-orders voor DKG
+	do BevestigEDIOrders(##class(APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.DKG).%New())
+	quit
+	
 VerwerkEDIOrdersBruynzeel ; ATK verwerking EDI (Electronic Data Interchange) voor klant 11708 Bruynzeel
 	Try {
 
@@ -910,3 +915,4 @@
 
 
 
+
FishEye: Tag 31323 refers to a dead (removed) revision in file `APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijAfhandelaarBruynzeel.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijAfhandelaar/Base.cls.xml
===================================================================
diff -u
--- APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijAfhandelaar/Base.cls.xml	(revision 0)
+++ APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijAfhandelaar/Base.cls.xml	(revision 31323)
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.Base">
+<Abstract>1</Abstract>
+<Super>TECH.RegisteredObject,APPS.OV.OrderBevestiging.OrderBevestigingWachtrijAfhandelaar</Super>
+
+<Property name="Verstuurder">
+<Type>APPS.OV.OrderBevestiging.OrderBevestigingWachtrijAfhandelaar.Verstuurder</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Bevestigingen">
+<Type>APPS.OV.OrderBevestiging.dto.BruynzeelBevestiging</Type>
+<Collection>list</Collection>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Abstract>1</Abstract>
+<FormalSpec>Verstuurder:APPS.OV.OrderBevestiging.OrderBevestigingWachtrijAfhandelaar.Verstuurder</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+</Method>
+
+<Method name="VerstuurBevestigingen">
+<Implementation><![CDATA[
+	#dim BevestigingIDs As %ListOfDataTypes = ..VerwerkOrders()
+	
+	if (..Bevestigingen.Count() > 0) {
+		do ..Verstuurder.VerstuurBevestiging(..Bevestigingen)
+		do ..ZetStatusOpBevestigd(BevestigingIDs)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="HeeftBevestigingen">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim BevestigingIDs As %ListOfDataTypes = ..VerwerkOrders()
+	
+	quit (BevestigingIDs.Count() > 0)
+]]></Implementation>
+</Method>
+
+<Method name="IsVanToepassing">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit 1
+]]></Implementation>
+</Method>
+
+<Method name="GeefKlantID">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<ReturnType>DOM.common.PartijID</ReturnType>
+</Method>
+
+<Method name="VerwerkOrders">
+<Description>
+Return BevestigingIDs van verwerkte Orders</Description>
+<Private>1</Private>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+	do ..Bevestigingen.Clear()
+	
+	#dim BevestigingIDs As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
+	#dim OrderAPI As DOM.VKP.OrderAPI = ##class(DOM.DomeinContext).Instance().GeefOrderAPI()
+	#dim ResultSet As TECH.ResultSet = ..GeefNogTeBevestigenOrders()
+
+	while (ResultSet.Next()) {
+		#dim ID As %String = ResultSet.Data("ID")
+		#dim OrderBevestiging As APPS.OV.OrderBevestiging.data.Order = ##class(APPS.OV.OrderBevestiging.data.Order).OpenId(ID)
+		
+		try {
+			#dim Order As DOM.VKP.Order = OrderAPI.GeefOrder(OrderBevestiging.OrderID)
+			
+			if (..MagOrderVerwerktWorden(Order)) {
+				do BevestigingIDs.Insert(OrderBevestiging.GeefID())
+				do ..VerwerkOrder(Order)
+			}
+		} catch {
+			#dim Exception As TECH.IException = ##class(TECH.ExceptionHandler).Catch()
+			
+			do ##class(vhLib.Logger).%New("OV").LogEnMailExceptie(Exception, ..GeefExtraOmschrijvingVoorOrderVerwerkingException())
+		}
+	}
+	
+	quit BevestigingIDs
+]]></Implementation>
+</Method>
+
+<Method name="GeefExtraOmschrijvingVoorOrderVerwerkingException">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<ReturnType>TECH.String</ReturnType>
+</Method>
+
+<Method name="GeefNogTeBevestigenOrders">
+<Private>1</Private>
+<ReturnType>TECH.ResultSet</ReturnType>
+<Implementation><![CDATA[
+	#dim QueryUitvoerder As TECH.Query.QueryUitvoerder = ##class(TECH.Context).Instance().GeefQueryAPI().GeefQueryUitvoerder()
+	#dim Query As TECH.String = "SELECT ID FROM APPS_OV_OrderBevestiging_data.Order WHERE KlantID = ? AND BevestigingStatus = ?"
+	
+	quit QueryUitvoerder.VoerUit(Query, $ListBuild(..GeefKlantID(), ##class(APPS.OV.OrderBevestiging.enu.BevestigingStatus).NogTeBevestigen()))
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkOrder">
+<FormalSpec>Order:DOM.VKP.Order</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim Iterator As TECH.Iterator = Order.GeefProductOrderLijnIterator()
+	
+	while (Iterator.HasNext()) {
+		#dim ProductOrderLijn As DOM.VKP.ProductOrderlijn = Iterator.Next()
+		#dim Bevestiging As APPS.OV.OrderBevestiging.dto.BruynzeelBevestiging = ##class(APPS.OV.OrderBevestiging.dto.BruynzeelBevestiging).%New()
+	
+		set Bevestiging.OrderIDBruynzeel = Order.GeefDocumentReferenties().GeefOrderReferentieZonderDatum()
+		set Bevestiging.PositieNrBruynzeelOrder = ProductOrderLijn.GeefProjectReferentie()	
+		set Bevestiging.BevestigingNrLeverancier = Order.GeefID()
+		set Bevestiging.PrijsPerStuk = $$EXTNUM^vhLib.DataTypes(ProductOrderLijn.GeefEenheidPrijsExclBTW(), 0, "", 2)
+		set Bevestiging.AantalStuks = ProductOrderLijn.GeefAantal()
+		set Bevestiging.Leverweek = ..GeefLeverweek(Order.GeefVroegsteLeverdatum())
+	
+		do ..Bevestigingen.Insert(Bevestiging)	
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GeefLeverweek">
+<FormalSpec>Datum:%Date</FormalSpec>
+<Private>1</Private>
+<ReturnType>TECH.String</ReturnType>
+<Implementation><![CDATA[
+	#dim Info As TECH.String = $$EXTDATE^vhLib.DataTypes(Datum, "DW4")
+	#dim WeekJaar As TECH.String = $Piece(Info, "/", 2) _ "." _ $Piece(Info, "/", 1)
+	
+	quit WeekJaar
+]]></Implementation>
+</Method>
+
+<Method name="MagOrderVerwerktWorden">
+<FormalSpec>Order:DOM.VKP.Order</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim MagOrderVerwerktWorden As %Boolean = $$$True
+	
+	try {
+		do ..ControleerMagOrderVerwerken(Order)
+	} catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch("TECH.Exceptions.InvalidInputException")
+		
+		set MagOrderVerwerktWorden = $$$False
+	}
+
+	quit MagOrderVerwerktWorden
+]]></Implementation>
+</Method>
+
+<Method name="ControleerMagOrderVerwerken">
+<FormalSpec>Order:DOM.VKP.Order,TestBevestigingDoorBlum:%Boolean=$$$True</FormalSpec>
+<Implementation><![CDATA[
+	if (Order.IsDirectOrder()) {
+		#dim Toelevering As DOM.AKP.Toelevering = Order.GeefEersteToelevering()
+		
+		if (TestBevestigingDoorBlum && (Toelevering.GeefBestelBevestigingNr() = "")) {
+			do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("DirectOrder '" _ Order.GeefID() _ "' nog niet door Blum bevestigd, en kan daarom nog niet toegevoegd worden."))	
+		}
+	} else {	
+		if $$$Not((Order.GeefStatus() = ##class(DOM.VKP.enu.OrderStatus).Gesloten()) || (Order.GeefStatus() = ##class(DOM.VKP.enu.OrderStatus).GeslotenMetKomBestelling()))	{
+			do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Order '" _ Order.GeefID() _ "' is nog niet gesloten en kan daarom niet bevestigd worden."))
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="ZetStatusOpBevestigd">
+<FormalSpec>BevestigingIDs:%ListOfDataTypes</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim Iterator As TECH.Iterator = ##class(TECH.ListIterator).%New(BevestigingIDs)
+	
+	while (Iterator.HasNext()) {
+		#dim TeBevestigenOrder As APPS.OV.OrderBevestiging.data.Order = ##class(APPS.OV.OrderBevestiging.data.Order).OpenId(Iterator.Next())
+		
+		set TeBevestigenOrder.BevestigingStatus = ##class(APPS.OV.OrderBevestiging.enu.BevestigingStatus).Bevestigd()
+		
+		do TeBevestigenOrder.Save()
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
FishEye: Tag 31323 refers to a dead (removed) revision in file `APPS/OV/OrderBevestiging/impl/OrderBevestigerBruynzeel.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 31323 refers to a dead (removed) revision in file `APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijAfhandelaarBruynzeel/Verstuurder.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: APPS/OV/OrderBevestiging/impl/OrderBevestigerBruynzeel.cls.xml
===================================================================
diff -u -r29059 -r31323
--- APPS/OV/OrderBevestiging/impl/OrderBevestigerBruynzeel.cls.xml	(.../OrderBevestigerBruynzeel.cls.xml)	(revision 29059)
+++ APPS/OV/OrderBevestiging/impl/OrderBevestigerBruynzeel.cls.xml	(.../OrderBevestigerMetWachtrij.cls.xml)	(revision 31323)
@@ -1,13 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="APPS.OV.OrderBevestiging.impl.OrderBevestigerBruynzeel">
+<Class name="APPS.OV.OrderBevestiging.impl.OrderBevestigerMetWachtrij">
 <Super>TECH.RegisteredObject,APPS.OV.OrderBevestiging.OrderBevestiger</Super>
 
+<Property name="OrderBevestigingService">
+<Type>APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijService</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>Afhandelaar:APPS.OV.OrderBevestiging.OrderBevestigingWachtrijAfhandelaar</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..OrderBevestigingService = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijService).%New(Afhandelaar)
+	
+	quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="VerstuurOrderBevestiging">
 <FormalSpec>OrderID:%String</FormalSpec>
-<Implementation><![CDATA[
-	set OrderBevestigingService = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijService).%New()
-	do OrderBevestigingService.PlaatsInWachtRij(OrderID)
+<Implementation><![CDATA[	do ..OrderBevestigingService.PlaatsInWachtRij(OrderID)
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/OV/OrderBevestiging/OrderBevestigingWachtrijAfhandelaar/Verstuurder.cls.xml
===================================================================
diff -u
--- APPS/OV/OrderBevestiging/OrderBevestigingWachtrijAfhandelaar/Verstuurder.cls.xml	(revision 0)
+++ APPS/OV/OrderBevestiging/OrderBevestigingWachtrijAfhandelaar/Verstuurder.cls.xml	(revision 31323)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.OV.OrderBevestiging.OrderBevestigingWachtrijAfhandelaar.Verstuurder">
+<Abstract>1</Abstract>
+<Super>TECH.Interface</Super>
+
+<Method name="VerstuurBevestiging">
+<FormalSpec>Bevestigingen:%ListOfObjects</FormalSpec>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijAfhandelaar/Verstuurder/Verstuurder.cls.xml
===================================================================
diff -u -r29059 -r31323
--- APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijAfhandelaar/Verstuurder/Verstuurder.cls.xml	(.../OrderBevestigingWachtrijAfhandelaarBruynzeel/Verstuurder.cls.xml)	(revision 29059)
+++ APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijAfhandelaar/Verstuurder/Verstuurder.cls.xml	(.../OrderBevestigingWachtrijAfhandelaar/Verstuurder/Bruynzeel.cls.xml)	(revision 31323)
@@ -1,70 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaarBruynzeel.Verstuurder">
-<Super>%RegisteredObject</Super>
+<Class name="APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.Verstuurder.Bruynzeel">
+<Super>APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.Verstuurder.Base</Super>
 
-<Property name="BestandNaam">
-<Type>%String</Type>
+<Method name="GeefOntvanger">
 <Private>1</Private>
-</Property>
-
-<Method name="%OnNew">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	#dim TempDir As %String = ##class(TECH.Config.ConfigMgr).Instance().GetString("vhDev.TempFilePath")	
-	#dim TempFile As %String = "VanHoecke_"_##class(TECH.Files).GeefCurrentTimeStamp()_"_"_$random(99999999)_".csv"
-	Set ..BestandNaam = ##class(TECH.Files).AppendFile(TempDir,TempFile)	
-	Quit $$$OK
+<ReturnType>TECH.String</ReturnType>
+<Implementation><![CDATA[	quit "APPS.OV.OrderBevestiging.Bruynzeel_MailNaar"
 ]]></Implementation>
 </Method>
 
-<Method name="VerstuurBevestiging">
-<FormalSpec>Bevestigingen:%ListOfObjects</FormalSpec>
-<Implementation><![CDATA[
-	#dim Ontvanger As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("APPS.OV.OrderBevestiging.Bruynzeel_MailNaar")
-	#dim OntvangerCC As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("APPS.OV.OrderBevestiging.Bruynzeel_MailNaarCC")
-	#dim MailAPI As TECH.Mail.MailAPI = ##class(TECH.Context).Instance().GeefMailAPI()
-	
-	#dim Mail As TECH.Mail.Mail = MailAPI.MaakNieuwMail()
-	Do Mail.VoegToeOntvanger(Ontvanger)
-	Do Mail.VoegToeOntvangerCC(OntvangerCC)
-	Do Mail.ZetVerzender("nbr@vanhoecke.be")
-	Do Mail.ZetOnderwerp("Orderbevestiging VanHoecke")
-	
-	Do ..MaakAttachment(Bevestigingen)
-	Do Mail.VoegToeBijlage(..BestandNaam)
-	
-	Do MailAPI.VerstuurMail(Mail)
-]]></Implementation>
-</Method>
-
-<Method name="MaakAttachment">
-<FormalSpec>Bevestigingen:%ListOfObjects</FormalSpec>
+<Method name="GeefOntvangerCC">
 <Private>1</Private>
-<Implementation><![CDATA[
-	#dim DataExporter As TECH.DataExporter.DataExporter = ##class(TECH.Context).Instance().GeefFileAPI().GeefDataExporter()
-	
-	do DataExporter.ZetScheidingsTeken(";")
-	
-	#dim ExportInfo As TECH.DataExporter.ExportInfo = ##class(TECH.DataExporter.ExportInfo).%New()
-	
-	Set ExportInfo.ExporteerHoofding = 0
-	
-	Do ExportInfo.Velden.Insert("LeverancierNr")
-	Do ExportInfo.Velden.Insert("OrderIDBruynzeel")
-	Do ExportInfo.Velden.Insert("PositieNrBruynzeelOrder")
-	Do ExportInfo.Velden.Insert("BevestigingNrLeverancier")
-	Do ExportInfo.Velden.Insert("PrijsPerStuk")
-	Do ExportInfo.Velden.Insert("Leverweek")
-	Do ExportInfo.Velden.Insert("AantalStuks")
-	
-	#dim BevestigingIt As TECH.Iterator = ##class(TECH.ListIterator).%New(Bevestigingen)
-	While BevestigingIt.HasNext(){
-		#dim Bevestiging As APPS.OV.OrderBevestiging.dto.BruynzeelBevestiging = BevestigingIt.Next()
-		Do ExportInfo.Data.Insert(Bevestiging)	
-	}	
-	
-	Do DataExporter.Export(..BestandNaam,ExportInfo)
+<ReturnType>TECH.String</ReturnType>
+<Implementation><![CDATA[	quit "APPS.OV.OrderBevestiging.Bruynzeel_MailNaarCC"
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijAfhandelaar/Verstuurder/DKG.cls.xml
===================================================================
diff -u
--- APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijAfhandelaar/Verstuurder/DKG.cls.xml	(revision 0)
+++ APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijAfhandelaar/Verstuurder/DKG.cls.xml	(revision 31323)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.Verstuurder.DKG">
+<Super>APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.Verstuurder.Base</Super>
+
+<Method name="GeefOntvanger">
+<Private>1</Private>
+<ReturnType>TECH.String</ReturnType>
+<Implementation><![CDATA[	quit ##class(TECH.Config.ConfigMgr).Instance().GeefString("APPS.OV.OrderBevestiging.DKG_MailNaar")
+]]></Implementation>
+</Method>
+
+<Method name="GeefOntvangerCC">
+<Private>1</Private>
+<ReturnType>TECH.String</ReturnType>
+<Implementation><![CDATA[	quit ##class(TECH.Config.ConfigMgr).Instance().GeefString("APPS.OV.OrderBevestiging.DKG_MailNaarCC")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijAfhandelaar/OrderBevestigingWachtrijAfhandelaarDummy.cls.xml
===================================================================
diff -u -r29059 -r31323
--- APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijAfhandelaar/OrderBevestigingWachtrijAfhandelaarDummy.cls.xml	(.../OrderBevestigingWachtrijAfhandelaarDummy.cls.xml)	(revision 29059)
+++ APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijAfhandelaar/OrderBevestigingWachtrijAfhandelaarDummy.cls.xml	(.../OrderBevestigingWachtrijAfhandelaar/Dummy.cls.xml)	(revision 31323)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaarDummy">
-<Super>TECH.RegisteredObject,APPS.OV.OrderBevestiging.OrderBevestigingWachtrijAfhandelaar</Super>
+<Class name="APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.Dummy">
+<Super>APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.Base</Super>
 
 <Method name="VerstuurBevestigingen">
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="HeeftBevestigingen">
Index: APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijAfhandelaar/OrderBevestigingWachtrijAfhandelaarBruynzeel.cls.xml
===================================================================
diff -u -r29059 -r31323
--- APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijAfhandelaar/OrderBevestigingWachtrijAfhandelaarBruynzeel.cls.xml	(.../OrderBevestigingWachtrijAfhandelaarBruynzeel.cls.xml)	(revision 29059)
+++ APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijAfhandelaar/OrderBevestigingWachtrijAfhandelaarBruynzeel.cls.xml	(.../OrderBevestigingWachtrijAfhandelaar/Bruynzeel.cls.xml)	(revision 31323)
@@ -1,175 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaarBruynzeel">
-<Super>TECH.RegisteredObject,APPS.OV.OrderBevestiging.OrderBevestigingWachtrijAfhandelaar</Super>
+<Class name="APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.Bruynzeel">
+<Super>APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.Base</Super>
 
-<Property name="Verstuurder">
-<Type>APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaarBruynzeel.Verstuurder</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="Bevestigingen">
-<Type>APPS.OV.OrderBevestiging.dto.BruynzeelBevestiging</Type>
-<Collection>list</Collection>
-<Private>1</Private>
-</Property>
-
 <Method name="%OnNew">
-<FormalSpec>Verstuurder:APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaarBruynzeel.Verstuurder</FormalSpec>
+<FormalSpec>Verstuurder:APPS.OV.OrderBevestiging.OrderBevestigingWachtrijAfhandelaar.Verstuurder</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..Verstuurder = $$$Implementation(Verstuurder,##class(APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaarBruynzeel.Verstuurder).%New())
-	Quit $$$OK
-]]></Implementation>
-</Method>
-
-<Method name="VerstuurBevestigingen">
-<Implementation><![CDATA[
-	#dim BevestigingIDs As %ListOfDataTypes = ..VerwerkOrders()
+	set ..Verstuurder = $$$Implementation(Verstuurder, ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.Verstuurder.Bruynzeel).%New())
 	
-	If ..Bevestigingen.Count() > 0 {
-		Do ..Verstuurder.VerstuurBevestiging(..Bevestigingen)
-		Do ..ZetStatusOpBevestigd(BevestigingIDs)
-	}
+	quit $$$OK
 ]]></Implementation>
 </Method>
 
-<Method name="HeeftBevestigingen">
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	
-	#dim BevestigingIDs As %ListOfDataTypes = ..VerwerkOrders()
-	quit BevestigingIDs.Count() > 0
-]]></Implementation>
-</Method>
-
-<Method name="IsVanToepassing">
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	quit 1
-]]></Implementation>
-</Method>
-
 <Method name="GeefKlantID">
 <Private>1</Private>
 <ReturnType>DOM.common.PartijID</ReturnType>
-<Implementation><![CDATA[	Quit ##class(DOM.VKP.enu.Klant).Bruynzeel()
+<Implementation><![CDATA[	quit ##class(DOM.VKP.enu.Klant).Bruynzeel()
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkOrders">
-<Description>
-Return BevestigingIDs van verwerkte Orders</Description>
+<Method name="GeefExtraOmschrijvingVoorOrderVerwerkingException">
 <Private>1</Private>
-<ReturnType>%ListOfDataTypes</ReturnType>
-<Implementation><![CDATA[
-	do ..Bevestigingen.Clear()
-	Set BevestigingIDs = ##class(%ListOfDataTypes).%New()
-	#dim QueryUitvoerder As TECH.Query.QueryUitvoerder = ##class(TECH.Context).Instance().GeefQueryAPI().GeefQueryUitvoerder()
-	#dim OrderAPI As DOM.VKP.OrderAPI = ##class(DOM.DomeinContext).Instance().GeefOrderAPI()
-	
-	#dim Query As %String = "SELECT ID FROM APPS_OV_OrderBevestiging_data.Order WHERE KlantID = ? AND BevestigingStatus = ?"
-	#dim ResultSet As TECH.ResultSet = QueryUitvoerder.VoerUit(Query,$LB(..GeefKlantID(),##class(APPS.OV.OrderBevestiging.enu.BevestigingStatus).NogTeBevestigen()))
-	While ResultSet.Next(){
-		#dim ID As %String = ResultSet.Data("ID")
-		#dim OrderBev As APPS.OV.OrderBevestiging.data.Order = ##class(APPS.OV.OrderBevestiging.data.Order).OpenId(ID)
-		Try {
-			#dim Order As DOM.VKP.Order = OrderAPI.GeefOrder(OrderBev.OrderID)
-			If ..MagOrderVerwerktWorden(Order){
-				Do BevestigingIDs.Insert(OrderBev.GeefID())
-				Do ..VerwerkOrder(Order)
-			}
-		}
-		Catch {
-			#dim Exception As TECH.IException = ##class(TECH.ExceptionHandler).Catch()
-			Do ##class(vhLib.Logger).%New("OV").LogEnMailExceptie(Exception,"OrderBevestigingWachtrijAfhandelaarBruynzeel")
-		}
-	}
-	Quit BevestigingIDs
+<ReturnType>TECH.String</ReturnType>
+<Implementation><![CDATA[	quit "OrderBevestigingWachtrijAfhandelaarBruynzeel"
 ]]></Implementation>
 </Method>
-
-<Method name="VerwerkOrder">
-<FormalSpec>Order:DOM.VKP.Order</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	#dim ProductOrderLijnIt As TECH.Iterator = Order.GeefProductOrderLijnIterator()
-	While ProductOrderLijnIt.HasNext() {
-		#dim ProductOrderLijn As DOM.VKP.ProductOrderlijn = ProductOrderLijnIt.Next()
-	
-		Set Bevestiging = ##class(APPS.OV.OrderBevestiging.dto.BruynzeelBevestiging).%New()
-	
-		Set Bevestiging.OrderIDBruynzeel = Order.GeefDocumentReferenties().GeefOrderReferentieZonderDatum()
-		Set Bevestiging.PositieNrBruynzeelOrder = ProductOrderLijn.GeefProjectReferentie()	
-		Set Bevestiging.BevestigingNrLeverancier = Order.GeefID()
-		Set Bevestiging.PrijsPerStuk = $$EXTNUM^vhLib.DataTypes(ProductOrderLijn.GeefEenheidPrijsExclBTW(),0,"",2)
-		Set Bevestiging.AantalStuks = ProductOrderLijn.GeefAantal()
-		Set Bevestiging.Leverweek = ..GeefLeverweek(Order.GeefVroegsteLeverdatum())
-	
-		Do ..Bevestigingen.Insert(Bevestiging)	
-	}
-]]></Implementation>
-</Method>
-
-<Method name="GeefLeverweek">
-<FormalSpec>Datum:%Date</FormalSpec>
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim Info As %String = $$EXTDATE^vhLib.DataTypes(Datum,"DW4")
-	#dim WeekJaar As %String = $Piece(Info,"/",2)_"."_$Piece(Info,"/",1)
-	Quit WeekJaar
-]]></Implementation>
-</Method>
-
-<Method name="MagOrderVerwerktWorden">
-<FormalSpec>Order:DOM.VKP.Order</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	#dim MagOrderVerwerktWorden As %Boolean = 1
-	Try{
-		Do ..ControleerMagOrderVerwerken(Order)
-	}Catch{
-		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch("TECH.Exceptions.InvalidInputException")
-		Set MagOrderVerwerktWorden = 0	
-	}	
-	Quit MagOrderVerwerktWorden
-]]></Implementation>
-</Method>
-
-<Method name="ControleerMagOrderVerwerken">
-<FormalSpec>Order:DOM.VKP.Order,TestBevestigingDoorBlum:%Boolean=1</FormalSpec>
-<Implementation><![CDATA[
-	If Order.IsDirectOrder() {
-		#dim Toelevering As DOM.AKP.Toelevering = Order.GeefEersteToelevering()
-		If (TestBevestigingDoorBlum &&  (Toelevering.GeefBestelBevestigingNr() = "")){
-			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("DirectOrder '"_Order.GeefID()_"' nog niet door Blum bevestigd, en kan daarom nog niet toegevoegd worden."))	
-		}
-	}Else{	
-		If '((Order.GeefStatus() = ##class(DOM.VKP.enu.OrderStatus).Gesloten())
-				|| (Order.GeefStatus() = ##class(DOM.VKP.enu.OrderStatus).GeslotenMetKomBestelling()))
-		{
-			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Order '"_Order.GeefID()_"' is nog niet gesloten en kan daarom niet bevestigd worden."))
-		}
-	}
-]]></Implementation>
-</Method>
-
-<Method name="ZetStatusOpBevestigd">
-<FormalSpec>BevestigingIDs:%ListOfDataTypes</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	Set OrderBevIDIt = ##class(TECH.ListIterator).%New(BevestigingIDs)
-	While OrderBevIDIt.HasNext(){
-		#dim OrderBev As APPS.OV.OrderBevestiging.data.Order = ##class(APPS.OV.OrderBevestiging.data.Order).OpenId(OrderBevIDIt.Next())
-		Set OrderBev.BevestigingStatus = ##class(APPS.OV.OrderBevestiging.enu.BevestigingStatus).Bevestigd()
-		Do OrderBev.Save()
-	}
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: APPS/OV/impl/OrderVerwerkingAPI.cls.xml
===================================================================
diff -u -r29059 -r31323
--- APPS/OV/impl/OrderVerwerkingAPI.cls.xml	(.../OrderVerwerkingAPI.cls.xml)	(revision 29059)
+++ APPS/OV/impl/OrderVerwerkingAPI.cls.xml	(.../OrderVerwerkingAPI.cls.xml)	(revision 31323)
@@ -5,7 +5,7 @@
 
 <Method name="GeefKlantInstellingenService">
 <ReturnType>APPS.common.KlantInstellingenService</ReturnType>
-<Implementation><![CDATA[	Quit ##class(APPS.OV.impl.KlantInstellingenServiceVanHoecke).%New()
+<Implementation><![CDATA[	quit ##class(APPS.OV.impl.KlantInstellingenServiceVanHoecke).%New()
 ]]></Implementation>
 </Method>
 
@@ -14,14 +14,21 @@
 <ReturnType>APPS.OV.OrderBevestiging.OrderBevestiger</ReturnType>
 <Implementation><![CDATA[
 	#dim OrderBevestiger As APPS.OV.OrderBevestiging.OrderBevestiger
-	If KlantID = ##class(DOM.VKP.enu.Klant).SFS(){
-		Set OrderBevestiger = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigerSFS).%New()
-	}ElseIf ##class(TECH.StringUtils).Equals(KlantID,##class(DOM.VKP.enu.Klant).Bruynzeel(),##class(DOM.VKP.enu.Klant).DKGDeKeukenfabriek()){
-		Set OrderBevestiger = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigerBruynzeel).%New()
-	}Else{
-		Set OrderBevestiger = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigerDummy).%New()
+	#dim Afhandelaar As APPS.OV.OrderBevestiging.OrderBevestigingWachtrijAfhandelaar
+	
+	if (KlantID = ##class(DOM.VKP.enu.Klant).SFS()) {
+		set OrderBevestiger = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigerSFS).%New()
+	} elseif (KlantID = ##class(DOM.VKP.enu.Klant).Bruynzeel()) {
+		set Afhandelaar = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.Bruynzeel).%New()
+		set OrderBevestiger = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigerMetWachtrij).%New(Afhandelaar)
+	} elseif (KlantID = ##class(DOM.VKP.enu.Klant).DKGDeKeukenfabriek()) {
+		set Afhandelaar = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.DKG).%New()
+		set OrderBevestiger = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigerMetWachtrij).%New(Afhandelaar)
+	} else {
+		set OrderBevestiger = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigerDummy).%New()
 	}
-	Quit OrderBevestiger
+	
+	quit OrderBevestiger
 ]]></Implementation>
 </Method>
 
@@ -30,12 +37,16 @@
 <ReturnType>APPS.OV.OrderBevestiging.OrderBevestigingWachtrijAfhandelaar</ReturnType>
 <Implementation><![CDATA[
 	#dim OrderBevestigingWachtrijAfhandelaar As APPS.OV.OrderBevestiging.OrderBevestigingWachtrijAfhandelaar
-	If KlantID = ##class(DOM.VKP.enu.Klant).Bruynzeel() {
-		Set OrderBevestigingWachtrijAfhandelaar = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaarBruynzeel).%New()
-	} Else {
-		Set OrderBevestigingWachtrijAfhandelaar = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaarDummy).%New()
+	
+	if (KlantID = ##class(DOM.VKP.enu.Klant).Bruynzeel()) {
+		set OrderBevestigingWachtrijAfhandelaar = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.Bruynzeel).%New()
+	} elseif (KlantID = ##class(DOM.VKP.enu.Klant).DKGDeKeukenfabriek()) {
+		set OrderBevestigingWachtrijAfhandelaar = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.DKG).%New()
+	} else {
+		set OrderBevestigingWachtrijAfhandelaar = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.Dummy).%New()
 	}
-	Quit OrderBevestigingWachtrijAfhandelaar
+	
+	quit OrderBevestigingWachtrijAfhandelaar
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/APPS/OV/impl/OrderBevestigerBruynzeel/Mock/OrderBevestigerBruynzeel.cls.xml
===================================================================
diff -u -r29059 -r31323
--- vhUnitTest/APPS/OV/impl/OrderBevestigerBruynzeel/Mock/OrderBevestigerBruynzeel.cls.xml	(.../OrderBevestigerBruynzeel.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/OV/impl/OrderBevestigerBruynzeel/Mock/OrderBevestigerBruynzeel.cls.xml	(.../OrderBevestigerBruynzeel.cls.xml)	(revision 31323)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.APPS.OV.impl.OrderBevestigerBruynzeel.Mock.OrderBevestigerBruynzeel">
-<Super>APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaarBruynzeel</Super>
+<Super>APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.Bruynzeel</Super>
 
 <Method name="GeefBevestigingen">
 <Implementation><![CDATA[	quit ..Bevestigingen
Index: vhUnitTest/APPS/OV/impl/OrderBevestigerBruynzeel/TestOrder/Verstuurder.cls.xml
===================================================================
diff -u -r29059 -r31323
--- vhUnitTest/APPS/OV/impl/OrderBevestigerBruynzeel/TestOrder/Verstuurder.cls.xml	(.../Verstuurder.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/OV/impl/OrderBevestigerBruynzeel/TestOrder/Verstuurder.cls.xml	(.../Verstuurder.cls.xml)	(revision 31323)
@@ -43,7 +43,7 @@
 <Implementation><![CDATA[
  
 #dim Bevestigingen As List Of APPS.OV.OrderBevestiging.dto.BruynzeelBevestiging = ..GeefBevestigingen()
-    Set Verstuurder = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaarBruynzeel.Verstuurder).%New()
+    Set Verstuurder = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.Verstuurder.Bruynzeel).%New()
     
     Do Verstuurder.VerstuurBevestiging(Bevestigingen)
         
Index: APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijService.cls.xml
===================================================================
diff -u -r29059 -r31323
--- APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijService.cls.xml	(.../OrderBevestigingWachtrijService.cls.xml)	(revision 29059)
+++ APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijService.cls.xml	(.../OrderBevestigingWachtrijService.cls.xml)	(revision 31323)
@@ -15,8 +15,9 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..Afhandelaar = $$$Implementation(OrderBevestigingWachtrijAfhandelaar,##class(APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaarBruynzeel).%New())
-	Quit $$$OK
+	set ..Afhandelaar = OrderBevestigingWachtrijAfhandelaar
+	
+	quit $$$OK
 ]]></Implementation>
 </Method>
 
@@ -29,7 +30,8 @@
 <FormalSpec>OrderID:%String</FormalSpec>
 <Implementation><![CDATA[
 	#dim Order As DOM.VKP.Order = ##class(DOM.DomeinContext).Instance().GeefOrderAPI().GeefOrder(OrderID)
-	set OrderBevestiging = ##class(APPS.OV.OrderBevestiging.data.Order).%New(Order.GeefKlantID(),OrderID)
+	#dim OrderBevestiging As APPS.OV.OrderBevestiging.data.Order= ##class(APPS.OV.OrderBevestiging.data.Order).%New(Order.GeefKlantID(), OrderID)
+	
 	do OrderBevestiging.Save()
 ]]></Implementation>
 </Method>
Index: vhTest/Mock/APPS/OV/OrderBevestiging/OrderBevestigingWachtrijAfhandelaar/Verstuurder.cls.xml
===================================================================
diff -u
--- vhTest/Mock/APPS/OV/OrderBevestiging/OrderBevestigingWachtrijAfhandelaar/Verstuurder.cls.xml	(revision 0)
+++ vhTest/Mock/APPS/OV/OrderBevestiging/OrderBevestigingWachtrijAfhandelaar/Verstuurder.cls.xml	(revision 31323)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.APPS.OV.OrderBevestiging.OrderBevestigingWachtrijAfhandelaar.Verstuurder">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.OV.OrderBevestiging.OrderBevestigingWachtrijAfhandelaar.Verstuurder,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+</Class>
+
+
+</Export>
FishEye: Tag 31323 refers to a dead (removed) revision in file `APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijAfhandelaarDummy.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijAfhandelaar/Verstuurder/Base.cls.xml
===================================================================
diff -u
--- APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijAfhandelaar/Verstuurder/Base.cls.xml	(revision 0)
+++ APPS/OV/OrderBevestiging/impl/OrderBevestigingWachtrijAfhandelaar/Verstuurder/Base.cls.xml	(revision 31323)
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.Verstuurder.Base">
+<Abstract>1</Abstract>
+<Super>TECH.RegisteredObject,APPS.OV.OrderBevestiging.OrderBevestigingWachtrijAfhandelaar.Verstuurder</Super>
+
+<Property name="BestandNaam">
+<Type>TECH.String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	#dim TempDir As TECH.String = ##class(TECH.Config.ConfigMgr).Instance().GetString("vhDev.TempFilePath")
+	#dim TempFile As TECH.String = "VanHoecke_" _ ##class(TECH.Files).GeefCurrentTimeStamp() _ "_" _ $random(99999999) _ ".csv"
+	
+	set ..BestandNaam = ##class(TECH.Files).AppendFile(TempDir, TempFile)
+	
+	quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="VerstuurBevestiging">
+<FormalSpec>Bevestigingen:%ListOfObjects</FormalSpec>
+<Implementation><![CDATA[
+	#dim MailAPI As TECH.Mail.MailAPI = ##class(TECH.Context).Instance().GeefMailAPI()
+	#dim Mail As TECH.Mail.Mail = MailAPI.MaakNieuwMail()
+	
+	do ..MaakAttachment(Bevestigingen)
+	
+	do Mail.VoegToeOntvanger(..GeefOntvanger())
+	do Mail.VoegToeOntvangerCC(..GeefOntvangerCC())
+	do Mail.ZetVerzender(..GeefVerzender())
+	do Mail.ZetOnderwerp(..GeefOnderwerp())
+	do Mail.VoegToeBijlage(..BestandNaam)
+	
+	do MailAPI.VerstuurMail(Mail)
+]]></Implementation>
+</Method>
+
+<Method name="MaakAttachment">
+<FormalSpec>Bevestigingen:%ListOfObjects</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim DataExporter As TECH.DataExporter.DataExporter = ##class(TECH.Context).Instance().GeefFileAPI().GeefDataExporter()
+	#dim ExportInfo As TECH.DataExporter.ExportInfo = ..GeefExportInfo()
+	#dim Iterator As TECH.Iterator = ##class(TECH.ListIterator).%New(Bevestigingen)
+
+	while (Iterator.HasNext()) {
+		#dim Bevestiging As APPS.OV.OrderBevestiging.dto.BruynzeelBevestiging = Iterator.Next()
+		
+		do ExportInfo.Data.Insert(Bevestiging)	
+	}	
+	
+	do DataExporter.ZetScheidingsTeken(";")
+	do DataExporter.Export(..BestandNaam, ExportInfo)
+]]></Implementation>
+</Method>
+
+<Method name="GeefExportInfo">
+<Private>1</Private>
+<ReturnType>TECH.DataExporter.ExportInfo</ReturnType>
+<Implementation><![CDATA[
+	#dim ExportInfo As TECH.DataExporter.ExportInfo = ##class(TECH.DataExporter.ExportInfo).%New()
+	
+	set ExportInfo.ExporteerHoofding = 0
+	
+	do ExportInfo.Velden.Insert("LeverancierNr")
+	do ExportInfo.Velden.Insert("OrderIDBruynzeel")
+	do ExportInfo.Velden.Insert("PositieNrBruynzeelOrder")
+	do ExportInfo.Velden.Insert("BevestigingNrLeverancier")
+	do ExportInfo.Velden.Insert("PrijsPerStuk")
+	do ExportInfo.Velden.Insert("Leverweek")
+	do ExportInfo.Velden.Insert("AantalStuks")
+	
+	quit ExportInfo
+]]></Implementation>
+</Method>
+
+<Method name="GeefOntvanger">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<ReturnType>TECH.String</ReturnType>
+</Method>
+
+<Method name="GeefOntvangerCC">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<ReturnType>TECH.String</ReturnType>
+</Method>
+
+<Method name="GeefVerzender">
+<Private>1</Private>
+<ReturnType>TECH.String</ReturnType>
+<Implementation><![CDATA[	quit "nbr@vanhoecke.be"
+]]></Implementation>
+</Method>
+
+<Method name="GeefOnderwerp">
+<Private>1</Private>
+<ReturnType>TECH.String</ReturnType>
+<Implementation><![CDATA[	quit "Orderbevestiging VanHoecke"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhDeploy/Deploy20151023xConfigItemOrderbevestingDKGEmailAdressen.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20151023xConfigItemOrderbevestingDKGEmailAdressen.cls.xml	(revision 0)
+++ vhDeploy/Deploy20151023xConfigItemOrderbevestingDKGEmailAdressen.cls.xml	(revision 31323)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20151023xConfigItemOrderbevestingDKGEmailAdressen">
+<ClassType/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>ConfigItem instellen voor emailadressen orderbevesting DKG</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	#dim PrefixSleutel As %String = "APPS.OV.OrderBevestiging.DKG"
+
+	do ##class(TECH.Config.ConfigMgr).Instance().SetString(PrefixSleutel _ "_MailNaar", "mvi@vanhoecke.be")
+	do ##class(TECH.Config.ConfigMgr).Instance().SetString(PrefixSleutel _ "_MailNaarCC", "mvi@vanhoecke.be")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhDeploy/Deploy20151027xVerwijderNogTeBevestigenOrdersDKG.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20151027xVerwijderNogTeBevestigenOrdersDKG.cls.xml	(revision 0)
+++ vhDeploy/Deploy20151027xVerwijderNogTeBevestigenOrdersDKG.cls.xml	(revision 31323)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20151027xVerwijderNogTeBevestigenOrdersDKG">
+<ClassType/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>Verwijder nog te bevestigen orders DKG</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	#dim QueryUitvoerder As TECH.Query.QueryUitvoerder = ##class(TECH.Context).Instance().GeefQueryAPI().GeefQueryUitvoerder()
+	#dim Query As TECH.String = "DELETE FROM APPS_OV_OrderBevestiging_data.Order WHERE KlantID = ? AND BevestigingStatus = ?"
+	
+	quit QueryUitvoerder.VoerUit(Query, $ListBuild(..GeefKlantID(), ##class(APPS.OV.OrderBevestiging.enu.BevestigingStatus).NogTeBevestigen()))
+]]></Implementation>
+</Method>
+
+<Method name="GeefKlantID">
+<ClassMethod>1</ClassMethod>
+<Private>1</Private>
+<ReturnType>DOM.common.PartijID</ReturnType>
+<Implementation><![CDATA[	quit ##class(DOM.VKP.enu.Klant).DKGDeKeukenfabriek()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>