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>