Index: AXimpl/Admin/CHUI/TerminalNavigationService.cls.xml
===================================================================
diff -u -r48535 -r49026
--- AXimpl/Admin/CHUI/TerminalNavigationService.cls.xml	(.../TerminalNavigationService.cls.xml)	(revision 48535)
+++ AXimpl/Admin/CHUI/TerminalNavigationService.cls.xml	(.../TerminalNavigationService.cls.xml)	(revision 49026)
@@ -48,7 +48,20 @@
 	#dim ComputerNaam as %String = WorkstationName _ ".vanhoecke.be"
 	#dim GebruikerId As %String = ..GebruikerLookup.GeefGebruikerId(AxGebruiker)
 	Do ##class(TECH.Context.RuntimeContext).Instance().ZetGebruikerID(GebruikerId)
-	Do ..TerminalNavigatieService.RaadpleegOrderOpKlantScherm(GebruikerId, ComputerNaam, ..OrderLookup.GeefOrderIdVanBevestigdOrder(AxSalesId))
+	
+	#Dim OrderID as %String = ""
+	#Dim KlantNr as %String = ""
+	try {
+		Set OrderID  = ..OrderLookup.GeefOrderIdVanBevestigdOrder(AxSalesId)	
+		Do ..TerminalNavigatieService.RaadpleegOrderOpKlantScherm(GebruikerId, ComputerNaam, OrderID)
+	} catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch(##class(AXimpl.Admin.DatabaseOutOfSyncException).%ClassName(1))
+		If Exception.GeefExtraInfo() = "Minstens 2 bevestigde orders met dezelfde Ax SalesId gevonden" {
+			Do ##class(TECH.ExceptionHandler).Throw(Exception)
+		}
+		Set KlantNr = ..OrderLookup.GeefLaatstBekendeKlantNummerVoorAXSalesId(AxSalesId)
+		Do ..TerminalNavigatieService.RaadpleegKlant(GebruikerId,ComputerNaam,KlantNr,##class(APPS.CHUI.enu.KlantRaadpleegScherm).Order())
+	}
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/AXimpl/Admin/CHUI/TerminalNavigationService/Test.cls.xml
===================================================================
diff -u -r48050 -r49026
--- vhUnitTest/AXimpl/Admin/CHUI/TerminalNavigationService/Test.cls.xml	(.../Test.cls.xml)	(revision 48050)
+++ vhUnitTest/AXimpl/Admin/CHUI/TerminalNavigationService/Test.cls.xml	(.../Test.cls.xml)	(revision 49026)
@@ -44,6 +44,57 @@
 	Do AppsTerminalNavigationServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
+
+<Method name="Test standaard gedrag bevestigd order (klant bestaat - order staat op bon)">
+<Implementation><![CDATA[
+	Set OrderLookupMock = ##class(vhTest.Mock.AXimpl.Admin.VKP.OrderLookup).%New()
+	
+	Set Exception = ##class(AXimpl.Admin.DatabaseOutOfSyncException).%New("","","")
+	Do OrderLookupMock.IndienMethodCall("GeefOrderIdVanBevestigdOrder","AxSalesId").DanException(Exception)
+	Do OrderLookupMock.VerwachtMethodCall("GeefLaatstBekendeKlantNummerVoorAXSalesId","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("RaadpleegKlant","AdminGebruiker","workstationname.vanhoecke.be","1000","O").DanDoeNiks()
+	
+	Set TerminalNavigationService = ##class(AXimpl.Admin.CHUI.TerminalNavigationService).%New(OrderLookupMock,GebruikerLookupMock,AppsTerminalNavigationServiceMock)
+	Do TerminalNavigationService.RaadpleegBevestigdOrder("AxSalesId","vhepn\adgebruiker","workstationname")
+
+	Do OrderLookupMock.Verifieer()
+	Do GebruikerLookupMock.Verifieer()
+	Do AppsTerminalNavigationServiceMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test standaard gedrag bevestigd order (klant bestaat - order nergens meer te vinden) dan exceptie">
+<Implementation><![CDATA[
+	Set OrderLookupMock = ##class(vhTest.Mock.AXimpl.Admin.VKP.OrderLookup).%New()
+	
+	Set DBOOSException = ##class(AXimpl.Admin.DatabaseOutOfSyncException).%New("","","")
+	Do OrderLookupMock.IndienMethodCall("GeefOrderIdVanBevestigdOrder","AxSalesId").DanException(DBOOSException)
+	Set IIException = ##class(TECH.Exceptions.InvalidInputException).%New("InvalidInput")
+	Do OrderLookupMock.IndienMethodCall("GeefLaatstBekendeKlantNummerVoorAXSalesId","AxSalesId").DanException(IIException)
+	
+	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("RaadpleegKlant","AdminGebruiker","workstationname.vanhoecke.be","1000","O").DanDoeNiks()
+	
+	Set TerminalNavigationService = ##class(AXimpl.Admin.CHUI.TerminalNavigationService).%New(OrderLookupMock,GebruikerLookupMock,AppsTerminalNavigationServiceMock)
+
+	#dim Substrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("InvalidInput")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException", Substrings))
+
+	Do TerminalNavigationService.RaadpleegBevestigdOrder("AxSalesId","vhepn\adgebruiker","workstationname")
+
+	Do OrderLookupMock.Verifieer()
+	Do GebruikerLookupMock.Verifieer()
+	Do AppsTerminalNavigationServiceMock.Verifieer()
+]]></Implementation>
+</Method>
 </Class>