Index: vhTest/Fake/CHUI/VKP/OrderIngave/OrderMarkeerder/Helper.cls.xml
===================================================================
diff -u -r49787 -r49801
--- vhTest/Fake/CHUI/VKP/OrderIngave/OrderMarkeerder/Helper.cls.xml	(.../Helper.cls.xml)	(revision 49787)
+++ vhTest/Fake/CHUI/VKP/OrderIngave/OrderMarkeerder/Helper.cls.xml	(.../Helper.cls.xml)	(revision 49801)
@@ -7,14 +7,15 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>CHUI.VKP.OrderIngave.OrderMarkeerder.Helper</Super>
 
-<Method name="IsOrderGemarkeerd">
-<FormalSpec>Index:%Integer,KlantNummer:%String,OrderNummer:%Integer</FormalSpec>
+<Method name="IsMagazijnBeschikbaar">
+<FormalSpec>OrderNummer:%Integer</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
 
-<Method name="IsMagazijnBeschikbaar">
+<Method name="IsOrderGemarkeerd">
+<FormalSpec>Index:%Integer,KlantNummer:%String,OrderNummer:%Integer</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
@@ -25,6 +26,11 @@
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
+
+<Method name="MarkeerOrder">
+<FormalSpec>OrderNummer:%Integer,Marked:%Boolean</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
 </Class>
 
 
Index: CHUI/VKP/OrderIngave/OrderMarkeerder/Helper.cls.xml
===================================================================
diff -u -r49787 -r49801
--- CHUI/VKP/OrderIngave/OrderMarkeerder/Helper.cls.xml	(.../Helper.cls.xml)	(revision 49787)
+++ CHUI/VKP/OrderIngave/OrderMarkeerder/Helper.cls.xml	(.../Helper.cls.xml)	(revision 49801)
@@ -22,6 +22,48 @@
 <Implementation><![CDATA[	Quit $$^vhTXTPOP("EWORDS","MAGAZIJNNIETBESCHIKBAAR")
 ]]></Implementation>
 </Method>
+
+<Method name="MarkeerOrder">
+<FormalSpec>OrderNummer:%Integer,Marked:%Boolean</FormalSpec>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+	Do ##class(Tools.Wlip).%New(42).String("MarkeerOrder:::" _ LD("SELECT") _ "|||||" _ %J _ "|||||" _ KLNr _ "|||||" _ ORDNr _ "|||||" _ OrderNummer)
+	
+	New Ref, StartRef
+	
+	Set Ref = LD("SELECT")
+	Set StartRef = Ref
+	
+	new R, IsNodigControleerBezwaren, GaVerder, VerzW
+	New OLNr, Quit, OLUNr, AskLink
+	
+	Set R = ^KOD(KLNr, "F", ORDNr, 1)
+	Set VerzW = $Piece($$DEFAULT^KLVERZW(, KLNr, ORDNr), ";")
+
+	If '$D(^HULP(%J,KLNr,"M")),VerzW'=$P($G(^HULP(%J,KLNr,"V")),D) Do MODVERZW^EWORDS(VerzW)
+	
+	#dim IsNodigControleerBezwaren As %Boolean = $$$True
+	#dim GaVerder As %Boolean = $$$True
+
+	If $$CUMORD^EWORDS3(.Ref) Do
+	. If 'Marked,$$CHKLINK^EWORDS5(ORDNr) Set AskLink=$$ASKLINK^EWORDS5(ORDNr) If AskLink'=ORDNr Do:AskLink'="A" SERIE^EWORDS5("LINK",ORDNr,"L") Quit
+	. For  Set Ref=$O(^HULP(%J,KLNr,"O",Ref)) Quit:Ref=""  Do  Quit:Quit
+	. . Quit:$$$Not(GaVerder)
+	. . Set R = ^HULP(%J, KLNr, "O", Ref)
+	. . Set Quit = $$$Not(ORDNr = $Piece(R, D))
+	. . Set OLNr = $Piece(R, D, 11)
+	. . Set OLUNr = $Piece(R, D, 19)
+	. . Quit:Quit
+	. . If Marked!('Marked&'$D(^HULP(%J,KLNr,"M","A",ORDNr,OLUNr))) Do
+	. . . Do MARKLINE^EWORDS5(.Ref,1+Marked,Marked,IsNodigControleerBezwaren,.GaVerder)
+	. . . Set IsNodigControleerBezwaren = 0
+	. . Else  Do LINE^vhLIST(.LD,LD("SELECT")) Do MOVE^vhLIST(.LD,"DO","")
+	. Do:Marked LINE^vhLIST(.LD,LD("SELECT")) Do MOVE^vhLIST(.LD,"DO","")
+	. If LD("SELECT")=LD("MAX") Set LD("SELECT")=StartRef Do LINE^vhLIST(.LD,LD("SELECT"))
+	
+	Quit
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/CHUI/VKP/OrderIngave/OrderMarkeerder/Test.cls.xml
===================================================================
diff -u -r49787 -r49801
--- vhUnitTest/CHUI/VKP/OrderIngave/OrderMarkeerder/Test.cls.xml	(.../Test.cls.xml)	(revision 49787)
+++ vhUnitTest/CHUI/VKP/OrderIngave/OrderMarkeerder/Test.cls.xml	(.../Test.cls.xml)	(revision 49801)
@@ -22,6 +22,25 @@
 	Do HelperMock.Verifieer()
 ]]></Implementation>
 </Method>
+
+<Method name="Test: Default VerzendWijze opvragen indien Order gemarkeerd mag worden">
+<Implementation><![CDATA[
+	#dim RandomIndex As %String = "RandomIndex"
+	#dim RandomKlantNummer As %String = "RandomKlantNummer"
+	#dim RandomOrderNummer As %String = "RandomOrderNummer"
+	#dim IsOrderGemarkeerd As %Boolean = $$$False
+	
+	#dim HelperMock As vhTest.Mock.CHUI.VKP.OrderIngave.OrderMarkeerder.Helper = ##class(vhTest.Mock.CHUI.VKP.OrderIngave.OrderMarkeerder.Helper).%New()
+	Do HelperMock.VerwachtMethodCall("IsOrderGemarkeerd", RandomIndex, RandomKlantNummer, RandomOrderNummer).DanReturn(IsOrderGemarkeerd)
+	Do HelperMock.VerwachtMethodCall("IsMagazijnBeschikbaar", RandomOrderNummer).DanReturn($$$True)
+	Do HelperMock.VerwachtMethodCall("MarkeerOrder", RandomOrderNummer, IsOrderGemarkeerd).DanDoeNiks()
+	
+	#dim OrderMarkeerder As CHUI.VKP.OrderIngave.OrderMarkeerder = ##class(CHUI.VKP.OrderIngave.OrderMarkeerder).%New(HelperMock)
+	#dim IsVolledigOrder As %Boolean = OrderMarkeerder.IsVolledigOrder(RandomIndex, RandomKlantNummer, RandomOrderNummer)
+	
+	Do HelperMock.Verifieer()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: CHUI/VKP/OrderIngave/OrderMarkeerder.cls.xml
===================================================================
diff -u -r49798 -r49801
--- CHUI/VKP/OrderIngave/OrderMarkeerder.cls.xml	(.../OrderMarkeerder.cls.xml)	(revision 49798)
+++ CHUI/VKP/OrderIngave/OrderMarkeerder.cls.xml	(.../OrderMarkeerder.cls.xml)	(revision 49801)
@@ -34,58 +34,15 @@
 		Set MagMarkeren = ..Helper.MagLaterVerwerktWorden()
 	}
 	
-	If (MagMarkeren) {
-		Do ..MarkeerOrder(OrderNummer, IsOrderGemarkeerd)
+	If (MagMarkeren) {		
+		Do ..Helper.MarkeerOrder(OrderNummer, IsOrderGemarkeerd)
 	} Else {
 		Set IsVolledigOrder = $$$False	
 	}
 	
 	Quit IsVolledigOrder
 ]]></Implementation>
 </Method>
-
-<Method name="MarkeerOrder">
-<FormalSpec>OrderNummer:%Integer,Marked:%Boolean</FormalSpec>
-<Private>1</Private>
-<ProcedureBlock>0</ProcedureBlock>
-<Implementation><![CDATA[
-	Do ##class(Tools.Wlip).%New(42).String("MarkeerOrder:::" _ LD("SELECT") _ "|||||" _ %J _ "|||||" _ KLNr _ "|||||" _ ORDNr _ "|||||" _ OrderNummer)
-	
-	New Ref, StartRef
-	
-	Set Ref = LD("SELECT")
-	Set StartRef = Ref
-	
-	new R, VerzW, IsNodigControleerBezwaren, GaVerder
-	New OLNr, Quit, OLUNr, AskLink
-	
-	Set R = ^KOD(KLNr, "F", ORDNr, 1)
-	Set VerzW = $Piece($$DEFAULT^KLVERZW(, KLNr, ORDNr), ";")
-
-	If '$D(^HULP(%J,KLNr,"M")),VerzW'=$P($G(^HULP(%J,KLNr,"V")),D) Do MODVERZW^EWORDS(VerzW)
-	
-	#dim IsNodigControleerBezwaren As %Boolean = $$$True
-	#dim GaVerder As %Boolean = $$$True
-
-	If $$CUMORD^EWORDS3(.Ref) Do
-	. If 'Marked,$$CHKLINK^EWORDS5(ORDNr) Set AskLink=$$ASKLINK^EWORDS5(ORDNr) If AskLink'=ORDNr Do:AskLink'="A" SERIE^EWORDS5("LINK",ORDNr,"L") Quit
-	. For  Set Ref=$O(^HULP(%J,KLNr,"O",Ref)) Quit:Ref=""  Do  Quit:Quit
-	. . Quit:$$$Not(GaVerder)
-	. . Set R = ^HULP(%J, KLNr, "O", Ref)
-	. . Set Quit = $$$Not(ORDNr = $Piece(R, D))
-	. . Set OLNr = $Piece(R, D, 11)
-	. . Set OLUNr = $Piece(R, D, 19)
-	. . Quit:Quit
-	. . If Marked!('Marked&'$D(^HULP(%J,KLNr,"M","A",ORDNr,OLUNr))) Do
-	. . . Do MARKLINE^EWORDS5(.Ref,1+Marked,Marked,IsNodigControleerBezwaren,.GaVerder)
-	. . . Set IsNodigControleerBezwaren = 0
-	. . Else  Do LINE^vhLIST(.LD,LD("SELECT")) Do MOVE^vhLIST(.LD,"DO","")
-	. Do:Marked LINE^vhLIST(.LD,LD("SELECT")) Do MOVE^vhLIST(.LD,"DO","")
-	. If LD("SELECT")=LD("MAX") Set LD("SELECT")=StartRef Do LINE^vhLIST(.LD,LD("SELECT"))
-	
-	Quit
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhTest/Mock/CHUI/VKP/OrderIngave/OrderMarkeerder/Helper.cls.xml
===================================================================
diff -u -r49787 -r49801
--- vhTest/Mock/CHUI/VKP/OrderIngave/OrderMarkeerder/Helper.cls.xml	(.../Helper.cls.xml)	(revision 49787)
+++ vhTest/Mock/CHUI/VKP/OrderIngave/OrderMarkeerder/Helper.cls.xml	(.../Helper.cls.xml)	(revision 49801)
@@ -27,6 +27,12 @@
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("MagLaterVerwerktWorden")
 ]]></Implementation>
 </Method>
+
+<Method name="MarkeerOrder">
+<FormalSpec>OrderNummer:%Integer,Marked:%Boolean</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("MarkeerOrder",OrderNummer,Marked)
+]]></Implementation>
+</Method>
 </Class>