Index: AXimpl/Admin/CHUI/TerminalNavigationService.cls.xml
===================================================================
diff -u -r43286 -r43323
--- AXimpl/Admin/CHUI/TerminalNavigationService.cls.xml	(.../TerminalNavigationService.cls.xml)	(revision 43286)
+++ AXimpl/Admin/CHUI/TerminalNavigationService.cls.xml	(.../TerminalNavigationService.cls.xml)	(revision 43323)
@@ -3,8 +3,39 @@
 <Class name="AXimpl.Admin.CHUI.TerminalNavigationService">
 <Super>TECH.Mockable</Super>
 
+<Property name="OrderLookup">
+<Type>AXimpl.Admin.VKP.OrderLookup</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="GebruikerLookup">
+<Type>AXimpl.Admin.Common.GebruikerLookup</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="TerminalNavigatieService">
+<Type>APPS.CHUI.TerminalNavigatieService</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>OrderLookup:AXimpl.Admin.VKP.OrderLookup,GebruikerLookup:AXimpl.Admin.Common.GebruikerLookup,TerminalNavigatieService:APPS.CHUI.TerminalNavigatieService</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..OrderLookup = $$$Inject(OrderLookup,##class(AXimpl.Admin.VKP.OrderLookup).%New())
+	Set ..GebruikerLookup = $$$Inject(GebruikerLookup,##class(AXimpl.Admin.Common.GebruikerLookup).%New())
+	Set ..TerminalNavigatieService = $$$Inject(TerminalNavigatieService, ##class(APPS.CHUI.TerminalNavigatieService).%New())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="RaadpleegOrder">
 <FormalSpec>AxSalesId:%String,AxGebruiker:%String,WorkStationName:%String</FormalSpec>
+<Implementation><![CDATA[	Do ..TerminalNavigatieService.RaadpleegOrder(..GebruikerLookup.GeefGebruikerId(AxGebruiker),WorkStationName,..OrderLookup.GeefOrderId(AxSalesId))
+]]></Implementation>
 </Method>
 </Class>
 
Index: vhUnitTest/AXimpl/Admin/CHUI/TerminalNavigationService/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/AXimpl/Admin/CHUI/TerminalNavigationService/Test.cls.xml	(revision 0)
+++ vhUnitTest/AXimpl/Admin/CHUI/TerminalNavigationService/Test.cls.xml	(revision 43323)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.AXimpl.Admin.CHUI.TerminalNavigationService.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test standaard gedrag">
+<Implementation><![CDATA[
+	Set OrderLookupMock = ##class(vhTest.Mock.AXimpl.Admin.VKP.OrderLookup).%New()
+	Do OrderLookupMock.VerwachtMethodCall("GeefOrderId","AxSalesId").DanReturn("1000")
+	
+	Set GebruikerLookupMock = ##class(vhTest.Mock.AXimpl.Admin.Common.GebruikerLookup).%New()
+	Do GebruikerLookupMock.VerwachtMethodCall("GeefGebruikerId","vhepn\adgebruiker").DanReturn("AdminGebruiker")
+	
+	Set APPSTerminalNavigationServiceMock = ##class(vhTest.Mock.APPS.CHUI.TerminalNavigatieService).%New()
+	Do APPSTerminalNavigationServiceMock.VerwachtMethodCall("RaadpleegOrder","AdminGebruiker","workstationname","1000").DanDoeNiks()
+	
+	Set TerminalNavigationService = ##class(AXimpl.Admin.CHUI.TerminalNavigationService).%New(OrderLookupMock,GebruikerLookupMock,APPSTerminalNavigationServiceMock)
+	Do TerminalNavigationService.RaadpleegOrder("AxSalesId","vhepn\adgebruiker","workstationname")
+
+	Do OrderLookupMock.Verifieer()
+	Do GebruikerLookupMock.Verifieer()
+	Do APPSTerminalNavigationServiceMock.Verifieer()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>