Index: WSimpl/AX/CHUI/TerminalNavigationService/NavigateToConfirmedOrder.cls.xml
===================================================================
diff -u -r44582 -r47698
--- WSimpl/AX/CHUI/TerminalNavigationService/NavigateToConfirmedOrder.cls.xml	(.../NavigateToConfirmedOrder.cls.xml)	(revision 44582)
+++ WSimpl/AX/CHUI/TerminalNavigationService/NavigateToConfirmedOrder.cls.xml	(.../NavigateToConfirmedOrder.cls.xml)	(revision 47698)
@@ -8,14 +8,20 @@
 <Private>1</Private>
 </Property>
 
+<Property name="Logger">
+<Type>vhLib.Logger</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>TerminalNavigationService:AXimpl.Admin.CHUI.TerminalNavigationService</FormalSpec>
+<FormalSpec>TerminalNavigationService:AXimpl.Admin.CHUI.TerminalNavigationService,Logger:vhLib.Logger</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..TerminalNavigationService = $$$Inject(TerminalNavigationService,##class(AXimpl.Admin.CHUI.TerminalNavigationService).%New())
+	Set ..Logger = $$$Inject(Logger,##class(vhLib.Logger).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -29,8 +35,13 @@
 		Do ..TerminalNavigationService.RaadpleegBevestigdOrder(NavigateToConfirmedOrderRequest.SalesIdAX,NavigateToConfirmedOrderRequest.ActiveDirectoryUserName,NavigateToConfirmedOrderRequest.WorkstationName )
 	} catch {
 		#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-		do ##class(vhLib.Logger).LogExceptie(Exceptie)
-		Set Response.Message = "Er is iets fout gegaan met het registreren van de Admin navigatieopdracht naar order met AX Sales id '" _ NavigateToConfirmedOrderRequest.SalesIdAX _"'"
+		if Exceptie.%IsA(##class(AXimpl.Admin.DatabaseOutOfSyncException).%ClassName(1)) && $$$Not(##class(TECH.StringUtils).Contains(Exceptie.GeefExtraInfo(),"Minstens 2 bevestigde orders met dezelfde Ax SalesId gevonden" )){
+			Set Response.Message = "In Ax geconfirmeerd order '" _ NavigateToConfirmedOrderRequest.SalesIdAX _ "' is waarschijnlijk nog niet verwerkt in Admin"
+			Do ..Logger.Warning("NavigateToConfirmedOrder",Response.Message)			
+		} else {
+			Do ..Logger.Error("NavigateToConfirmedOrder",Exceptie.GeefOmschrijving()_ $$$CRLF_ Exceptie.GeefExtraInfo())
+			Set Response.Message = "Er is iets fout gegaan met het registreren van de Admin navigatieopdracht naar order met AX Sales id '" _ NavigateToConfirmedOrderRequest.SalesIdAX _"'"
+		}
 	}		
 	Set Response.Message = $TRANSLATE(Response.Message,$CHAR(0),"")
 	Quit Response
Index: vhUnitTest/WSimpl/AX/CHUI/TerminalNavigationService/NavigateToConfirmedOrder/Test.cls.xml
===================================================================
diff -u -r44852 -r47698
--- vhUnitTest/WSimpl/AX/CHUI/TerminalNavigationService/NavigateToConfirmedOrder/Test.cls.xml	(.../Test.cls.xml)	(revision 44852)
+++ vhUnitTest/WSimpl/AX/CHUI/TerminalNavigationService/NavigateToConfirmedOrder/Test.cls.xml	(.../Test.cls.xml)	(revision 47698)
@@ -16,6 +16,63 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test Warning gelogd indien TerminalNavigatie service een Databaseoutofsync exceptie smijt omdat order nog niet bestaat">
+<Implementation><![CDATA[
+	Set TerminalNavigatieServiceMock = ##class(vhTest.Mock.AXimpl.Admin.CHUI.TerminalNavigationService).%New()
+	Set OutofSyncException = ##class(AXimpl.Admin.DatabaseOutOfSyncException).%New("Entiteit","AxId","AdminId")
+	Do TerminalNavigatieServiceMock.IndienMethodCall("RaadpleegBevestigdOrder","AxSalesId","AxUser","AxWorkStation").DanException(OutofSyncException)
+	
+	Set LoggerMock = ##class(vhTest.Mock.vhLib.Logger).%New()
+	Do LoggerMock.VerwachtMethodCall("Warning","NavigateToConfirmedOrder","In Ax geconfirmeerd order 'AxSalesId' is waarschijnlijk nog niet verwerkt in Admin",0).DanDoeNiks()
+	
+	Set Service = ##class(WSimpl.AX.CHUI.TerminalNavigationService.NavigateToConfirmedOrder).%New(TerminalNavigatieServiceMock,LoggerMock)
+	#dim Response as WS.AX.CHUI.dto.NavigateToConfirmedOrderResponse = Service.NavigateToConfirmedOrder(..GeefRequest())
+
+	do $$$AssertEquals(Response.Message,"In Ax geconfirmeerd order 'AxSalesId' is waarschijnlijk nog niet verwerkt in Admin")
+	
+	Do LoggerMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test Error gelogd indien TerminalNavigatie service een Databaseoutofsync exceptie smijt omdat er meer dan 1 order is met die AXSalesId">
+<Implementation><![CDATA[
+	Set TerminalNavigatieServiceMock = ##class(vhTest.Mock.AXimpl.Admin.CHUI.TerminalNavigationService).%New()
+	Set OutofSyncException = ##class(AXimpl.Admin.DatabaseOutOfSyncException).%New("Entiteit","AxId","AdminId")
+	Do OutofSyncException.VoegToeExtraInfo("Minstens 2 bevestigde orders met dezelfde Ax SalesId gevonden")
+	Do TerminalNavigatieServiceMock.IndienMethodCall("RaadpleegBevestigdOrder","AxSalesId","AxUser","AxWorkStation").DanException(OutofSyncException)
+	
+	Set LoggerMock = ##class(vhTest.Mock.vhLib.Logger).%New()
+	#dim ErrorDetails as %String = "!!! Ernstig probleem : Entiteit is niet meer in sync - AxId : 'AxId' - AdminId : 'AdminId' !!!!" _  $$$CRLF _ "Minstens 2 bevestigde orders met dezelfde Ax SalesId gevonden" _$$$CRLF
+	Do LoggerMock.VerwachtMethodCall("Error","NavigateToConfirmedOrder",ErrorDetails,0).DanDoeNiks()
+									          
+	Set Service = ##class(WSimpl.AX.CHUI.TerminalNavigationService.NavigateToConfirmedOrder).%New(TerminalNavigatieServiceMock,LoggerMock)
+	#dim Response as WS.AX.CHUI.dto.NavigateToConfirmedOrderResponse = Service.NavigateToConfirmedOrder(..GeefRequest())
+
+	do $$$AssertEquals(Response.Message,"Er is iets fout gegaan met het registreren van de Admin navigatieopdracht naar order met AX Sales id 'AxSalesId'")
+	
+	Do LoggerMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test Error gelogd indien TerminalNavigatie service een andere dan Databaseoutofsync exceptie smijt">
+<Implementation><![CDATA[
+	Set TerminalNavigatieServiceMock = ##class(vhTest.Mock.AXimpl.Admin.CHUI.TerminalNavigationService).%New()
+	Set AndereException = ##class(TECH.Exceptions.GeneralErrorException).%New("Een andere exceptie")
+	Do TerminalNavigatieServiceMock.IndienMethodCall("RaadpleegBevestigdOrder","AxSalesId","AxUser","AxWorkStation").DanException(AndereException)
+	
+	Set LoggerMock = ##class(vhTest.Mock.vhLib.Logger).%New()
+	#dim ErrorDetails as %String = "Een andere exceptie" _  $$$CRLF 
+	Do LoggerMock.VerwachtMethodCall("Error","NavigateToConfirmedOrder",ErrorDetails,0).DanDoeNiks()
+									          
+	Set Service = ##class(WSimpl.AX.CHUI.TerminalNavigationService.NavigateToConfirmedOrder).%New(TerminalNavigatieServiceMock,LoggerMock)
+	#dim Response as WS.AX.CHUI.dto.NavigateToConfirmedOrderResponse = Service.NavigateToConfirmedOrder(..GeefRequest())
+
+	do $$$AssertEquals(Response.Message,"Er is iets fout gegaan met het registreren van de Admin navigatieopdracht naar order met AX Sales id 'AxSalesId'")
+	
+	Do LoggerMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="GeefRequest">
 <Private>1</Private>
 <ReturnType>WS.AX.CHUI.dto.NavigateToConfirmedOrderRequest</ReturnType>