Index: WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml
===================================================================
diff -u -r50425 -r51397
--- WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml	(.../Service.cls.xml)	(revision 50425)
+++ WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml	(.../Service.cls.xml)	(revision 51397)
@@ -28,8 +28,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="OfferteRepository">
+<Type>APPS.VKP.Offerte.OfferteRepository</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>OfferteService:APPS.VKP.OfferteService="",ExterneVerkoopService:APPS.EC.Verkoop.ExterneVerkoopService,IntractoMelder:WSimpl.EC.Unishop.OrderConfirmation.Service.IntractoMelder.CartPort=""</FormalSpec>
+<FormalSpec>OfferteService:APPS.VKP.OfferteService="",ExterneVerkoopService:APPS.EC.Verkoop.ExterneVerkoopService="",IntractoMelder:WSimpl.EC.Unishop.OrderConfirmation.Service.IntractoMelder.CartPort="",OfferteRepository:APPS.VKP.Offerte.OfferteRepository</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -40,6 +45,7 @@
 	Set ..AuthorisatieControleur = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefAuthorisatieControleur()
 	Set ..PersonalityVerwerkerLinker = ##class(APPS.EC.impl.WebshopSessionService.impl.PersonalityEnVerwerkerLinker).%New()
 	Set ..IntractoMelder = $$$Inject(IntractoMelder,##class(WSimpl.EC.Unishop.OrderConfirmation.Service.IntractoMelder.CartPort).%New())
+	Set ..OfferteRepository = $$$Inject(OfferteRepository,##class(APPS.VKP.Offerte.impl.OfferteRepository).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -56,7 +62,7 @@
 		
 		Do ##class(vhLib.Logger).%New("APPS.EC").Info("ConfirmOrder Unishop","Bestel Unishop Offerte '"_EDInr_"' voor shop '"_Shop_"' met referentie: '"_BestelReferentie_"' datum '"_GevraagdeLeverdatum_"'.")
 		
-		#dim OfferteVanHandel As APPS.VKP.Offerte = ..GeefOfferteVanHandel(EDInr)
+		#dim OfferteVanHandel As APPS.VKP.Offerte = ..GeefOfferteVanHandel(EDInr, Shop)
 		If $$$Not(OfferteVanHandel.IsBesteld()) {
 			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Offerte '"_EDInr_"' van handel is nog niet besteld."))	
 		}
@@ -138,13 +144,13 @@
 </Method>
 
 <Method name="GeefOfferteVanHandel">
-<FormalSpec>EDInr:%Integer</FormalSpec>
+<FormalSpec>EDInr:%Integer,Shop:APPS.EC.enu.UniShopVerwerker</FormalSpec>
 <Private>1</Private>
 <ReturnType>APPS.VKP.Offerte</ReturnType>
 <Implementation><![CDATA[
 	#dim OfferteVanHandel As APPS.VKP.Offerte
 	Try {
-		#dim OfferteIDVanHandel As %String = ..GeefOfferteIDVanHandel(EDInr)
+		#dim OfferteIDVanHandel As %String = ..GeefOfferteIDVanHandel(EDInr, Shop)
 		Set OfferteVanHandel = ..OfferteService.GeefOfferte(OfferteIDVanHandel)
 	}Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch("TECH.Exceptions.InvalidInputException")
@@ -157,10 +163,16 @@
 </Method>
 
 <Method name="GeefOfferteIDVanHandel">
-<FormalSpec>EDInr:%Integer</FormalSpec>
+<FormalSpec>EDInr:%Integer,Shop:APPS.EC.enu.UniShopVerwerker</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit EDInr
+<Implementation><![CDATA[
+	If (Shop = ##class(APPS.EC.enu.UniShopVerwerker).SFS()) && (EDInr < 200000)  {
+		If ..OfferteRepository.BestaatViaExterneId(EDInr) {
+			Quit ..OfferteRepository.GeefViaExterneId(EDInr).GeefID()
+		}
+	}
+	Quit EDInr
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/TestBase.cls.xml
===================================================================
diff -u -r41332 -r51397
--- vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 41332)
+++ vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 51397)
@@ -54,6 +54,7 @@
 	
 	Set ..DocRefsVanHoeckeOfferte = ##class(DOM.VKP.DocumentReferenties).%New()
 	Set ..OfferteVanHandel = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Set ..Shop = ##class(APPS.EC.enu.UniShopVerwerker).HaefeleBelgie()
 
 	#dim VanHoeckeOfferteID As %Integer = ..EDInr+1
 	Do ..ZetMockVanHoeckeOfferte(VanHoeckeOfferteID)
Index: vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/Test1.cls.xml
===================================================================
diff -u -r50426 -r51397
--- vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/Test1.cls.xml	(.../Test1.cls.xml)	(revision 50426)
+++ vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/Test1.cls.xml	(.../Test1.cls.xml)	(revision 51397)
@@ -40,46 +40,107 @@
 	Do OfferteServiceStub.IndienMethodCall("GeefOfferteVanVH",..OfferteVanHandel).DanReturn(..VanHoeckeOfferte)
 
 	Do ..OfferteVanHandel.IndienMethodCall("IsBesteld").DanReturn(1)
-	Do ..ZetMockBestelOfferteVerwacht()
 	
 	Set IntractoInformeerderMock = ##class(vhTest.Mock.WSimpl.EC.Unishop.OrderConfirmation.Service.IntractoMelder.CartPort).%New()
 	Do IntractoInformeerderMock.VerwachtMethodCall("updateStatus",..EDInr,##class(WSimpl.EC.Unishop.OrderConfirmation.Service.IntractoMelder.enu.Status).ERP()).ExactAantalKeer(1)
 	
-	#dim BestelOfferteResultaat As WS.EC.Unishop.OrderConfirmation.ConfirmOrderResult =..GeefOrderServiceInternal(OfferteServiceStub, IntractoInformeerderMock).ConfirmOrder(..EDInr,..Shop,..BestelReferentie,..GevraagdeLeverdatum)
+	Set ExterneVerkoopService = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
+	Do ExterneVerkoopService.VerwachtMethodCall("BestelOfferte", ..VanHoeckeOfferte.GeefID(), ##class(DOM.VKP.enu.Klant).HaefeleBelgie(), ##class(DOM.common.enu.Personality).VanHoecke())
 	
+	#dim BestelOfferteResultaat As WS.EC.Unishop.OrderConfirmation.ConfirmOrderResult =..GeefOrderServiceInternal(OfferteServiceStub, ExterneVerkoopService, IntractoInformeerderMock).ConfirmOrder(..EDInr,..Shop,..BestelReferentie,..GevraagdeLeverdatum)
+	
 	If $$$AssertTrue($IsObject(BestelOfferteResultaat)) {
 		Do $$$AssertEquals(BestelOfferteResultaat.EDINr,..EDInr)
 		Do $$$AssertEquals(BestelOfferteResultaat.ProductionDays,99)
 	}
 	
 	Do $$$AssertEquals(..DocRefsVanHoeckeOfferte.KlantOrderNummer,..BestelReferentie)
 	
-	Do ..ExterneVerkoopService.Verifieer()
+	Do ExterneVerkoopService.Verifieer()
 	Do IntractoInformeerderMock.Verifieer()
 ]]></Implementation>
 </Method>
 
-<Method name="ZetMockBestelOfferteVerwacht">
-<Private>1</Private>
+<Method name="Test: SFS orders met ExternID &lt; 200000 moeten verwerkt worden mbv Repository">
 <Implementation><![CDATA[
-	#dim VanHoeckeOfferteID As %String = ..VanHoeckeOfferte.GeefID()
-	#dim KlantIdVanHandel As DOM.VKP.VanHoeckeKlantID = ##class(DOM.VKP.enu.Klant).HaefeleBelgie()
-	#dim VanHoeckePersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
-	Do ..ExterneVerkoopService.VerwachtMethodCall("BestelOfferte", VanHoeckeOfferteID, KlantIdVanHandel, VanHoeckePersonalityID)
+	Set ..Shop = ##class(APPS.EC.enu.UniShopVerwerker).SFS()
+	
+	#dim OfferteNummer As %Integer = 1
+	#dim LageEDInummer As %Integer = 77667
+	#dim OfferteBestaatNietMelding As %String = "UT_Melding_OfferteBestaatNiet"
+
+	Do ..OfferteVanHandel.IndienMethodCall("GeefID").DanReturn(OfferteNummer)
+	Do ..OfferteVanHandel.IndienMethodCall("IsBesteld").DanReturn(1)
+	
+	Set OfferteServiceStub = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	Do OfferteServiceStub.IndienMethodCall("GeefOfferte",OfferteNummer).DanReturn(..OfferteVanHandel)
+	Do OfferteServiceStub.IndienMethodCall("GeefOfferteVanVH",..OfferteVanHandel).DanReturn(..VanHoeckeOfferte)
+	Set ExterneVerkoopService = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
+	Do ExterneVerkoopService.VerwachtMethodCall("BestelOfferte", ..VanHoeckeOfferte.GeefID(), ##class(DOM.VKP.enu.Klant).SFS(), ##class(DOM.common.enu.Personality).VanHoecke())
+	
+	Set OfferteRepositoryMock = ##class(vhTest.Mock.APPS.VKP.Offerte.OfferteRepository).%New()
+	Do OfferteRepositoryMock.VerwachtMethodCall("BestaatViaExterneId",LageEDInummer).DanReturn($$$True)
+	Do OfferteRepositoryMock.VerwachtMethodCall("GeefViaExterneId",LageEDInummer).DanReturn(..OfferteVanHandel)
+	
+	Set IntractoInformeerderMock = ##class(vhTest.Mock.WSimpl.EC.Unishop.OrderConfirmation.Service.IntractoMelder.CartPort).%New()
+	Do IntractoInformeerderMock.VerwachtMethodCall("updateStatus",LageEDInummer,##class(WSimpl.EC.Unishop.OrderConfirmation.Service.IntractoMelder.enu.Status).ERP()).ExactAantalKeer(1)
+	
+	#dim BestelOfferteResultaat As WS.EC.Unishop.OrderConfirmation.ConfirmOrderResult =..GeefOrderServiceInternal(OfferteServiceStub,ExterneVerkoopService,IntractoInformeerderMock,OfferteRepositoryMock).ConfirmOrder(LageEDInummer,..Shop,..BestelReferentie,..GevraagdeLeverdatum)
+	
+	Do OfferteRepositoryMock.Verifieer()
+	Do ExterneVerkoopService.Verifieer()
+	Do IntractoInformeerderMock.Verifieer()
 ]]></Implementation>
 </Method>
 
+<Method name="Test: SFS orders met ExternID &lt; 200000 die niet bestaan -&gt; Exceptie">
+<Implementation><![CDATA[
+	Set ..Shop = ##class(APPS.EC.enu.UniShopVerwerker).SFS()
+	
+	#dim OfferteNummer As %Integer = 1
+	#dim LageEDInummer As %Integer = 77667
+	#dim OfferteBestaatNietMelding As %String = "UT_Melding_OfferteBestaatNiet"
+
+	Do ..OfferteVanHandel.IndienMethodCall("GeefID").DanReturn(OfferteNummer)
+	Do ..OfferteVanHandel.IndienMethodCall("IsBesteld").DanReturn(1)
+	
+	Set OfferteServiceStub = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	Do OfferteServiceStub.IndienMethodCall("GeefOfferte",LageEDInummer).DanException(##class(TECH.Exceptions.InvalidInputException).%New(OfferteBestaatNietMelding))
+	Do OfferteServiceStub.IndienMethodCall("GeefOfferteVanVH",..OfferteVanHandel).DanReturn(..VanHoeckeOfferte)
+	Set ExterneVerkoopService = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
+	Do ExterneVerkoopService.VerwachtMethodCall("BestelOfferte", ..VanHoeckeOfferte.GeefID(), ##class(DOM.VKP.enu.Klant).SFS(), ##class(DOM.common.enu.Personality).VanHoecke())
+	
+	Set OfferteRepositoryMock = ##class(vhTest.Mock.APPS.VKP.Offerte.OfferteRepository).%New()
+	Do OfferteRepositoryMock.VerwachtMethodCall("BestaatViaExterneId",LageEDInummer).DanReturn($$$False)
+	Do OfferteRepositoryMock.VerwachtMethodCall("GeefViaExterneId",LageEDInummer).DanReturn(..OfferteVanHandel)
+	
+	Set IntractoInformeerderMock = ##class(vhTest.Mock.WSimpl.EC.Unishop.OrderConfirmation.Service.IntractoMelder.CartPort).%New()
+	Do IntractoInformeerderMock.VerwachtMethodCall("updateStatus",LageEDInummer,##class(WSimpl.EC.Unishop.OrderConfirmation.Service.IntractoMelder.enu.Status).ERP()).ExactAantalKeer(1)
+	
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Unable to confirm order","Invalid EDI number ")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings))
+
+	#dim BestelOfferteResultaat As WS.EC.Unishop.OrderConfirmation.ConfirmOrderResult =..GeefOrderServiceInternal(OfferteServiceStub,ExterneVerkoopService,IntractoInformeerderMock,OfferteRepositoryMock).ConfirmOrder(LageEDInummer,..Shop,..BestelReferentie,..GevraagdeLeverdatum)
+	
+	Do OfferteRepositoryMock.Verifieer()
+	Do ExterneVerkoopService.Verifieer()
+	Do IntractoInformeerderMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="ZetMockBestelOfferteVerwacht">
+<Private>1</Private>
+</Method>
+
 <Method name="ZetObjectenVoorMockData">
 <Private>1</Private>
-<Implementation><![CDATA[	Set ..ExterneVerkoopService = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
-]]></Implementation>
 </Method>
 
 <Method name="GeefOrderServiceInternal">
-<FormalSpec>OfferteService:APPS.VKP.OfferteService="",IntractoInformeerderMock:WSimpl.EC.Unishop.OrderConfirmation.Service.IntractoMelder.CartPort=""</FormalSpec>
+<FormalSpec>OfferteService:APPS.VKP.OfferteService="",ExterneVerkoopService:APPS.EC.Verkoop.ExterneVerkoopService="",IntractoInformeerderMock:WSimpl.EC.Unishop.OrderConfirmation.Service.IntractoMelder.CartPort="",OfferteRepositoryMock:APPS.VKP.Offerte.OfferteRepository=""</FormalSpec>
 <Private>1</Private>
 <ReturnType>WSimpl.EC.Unishop.OrderConfirmation.Service</ReturnType>
-<Implementation><![CDATA[	Quit ##class(vhUnitTest.WSimpl.EC.Unishop.OrderConfirmation.Service.ConfirmOrder.ServiceMock).%New(OfferteService, ,IntractoInformeerderMock)
+<Implementation><![CDATA[	Quit ##class(vhUnitTest.WSimpl.EC.Unishop.OrderConfirmation.Service.ConfirmOrder.ServiceMock).%New(OfferteService, ExterneVerkoopService ,IntractoInformeerderMock, OfferteRepositoryMock)
 ]]></Implementation>
 </Method>
 </Class>