Index: WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml
===================================================================
diff -u -r54344 -r54350
--- WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml	(.../Service.cls.xml)	(revision 54344)
+++ WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml	(.../Service.cls.xml)	(revision 54350)
@@ -38,8 +38,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="DateTimeAPI">
+<Type>TECH.DateTime.DateTimeAPI</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="",OfferteRepository:APPS.VKP.Offerte.OfferteRepository</FormalSpec>
+<FormalSpec>OfferteService:APPS.VKP.OfferteService="",ExterneVerkoopService:APPS.EC.Verkoop.ExterneVerkoopService="",IntractoMelder:WSimpl.EC.Unishop.OrderConfirmation.Service.IntractoMelder="",OfferteRepository:APPS.VKP.Offerte.OfferteRepository,DateTimeAPI:TECH.DateTime.DateTimeAPI</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -51,8 +56,10 @@
 	Set ..PersonalityVerwerkerLinker = ##class(APPS.EC.impl.WebshopSessionService.impl.PersonalityEnVerwerkerLinker).%New()
 	Set ..IntractoMelder = $$$Inject(IntractoMelder,##class(WSimpl.EC.Unishop.OrderConfirmation.Service.IntractoMelder).%New())
 	Set ..OfferteRepository = $$$Inject(OfferteRepository,##class(APPS.VKP.Offerte.impl.OfferteRepository).%New())
-	Set ..FormatAPI = ##class(TECH.Context).Instance().GeefFormatAPI()
+	Set ..DateTimeAPI = $$$Inject(DateTimeAPI, ##class(TECH.Context).Instance().GeefDateTimeAPI())
 
+	Set ..FormatAPI = ##class(TECH.Context).Instance().GeefFormatAPI()
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -125,7 +132,7 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim LeverDatum As %Date = $$INTDATE^vhLib.DataTypes(GevraagdeLeverdatum)
-	#dim HuidigeDatum As %Date = ##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate()
+	#dim HuidigeDatum As %Date = ..DateTimeAPI.CurrentDate()
 	
 	If ((Shop = ##class(APPS.EC.enu.UniShopVerwerker).HaefeleBelgie()) && (LeverDatum = HuidigeDatum)) {
 		Do VanHoeckeOfferte.ZetLeverDatum(..BepaalLeverDatum(VanHoeckeOfferte.GeefWensLeverDatum(),LeverDatum))
@@ -153,7 +160,7 @@
 	
 	If (..WensLeverDatumHeeftGeldigFormaat(WensLeverDatum)) {
 		Try {
-			Set LeverDatum = $ZDateH($Translate(WensLeverDatum,".","/"),4)
+			Set LeverDatum = $ZDateH(WensLeverDatum,3)
 		} Catch {
 			Do ##class(TECH.ExceptionHandler).Catch()
 		}
@@ -167,7 +174,7 @@
 <FormalSpec>DatumString:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit (DatumString?1.2N1"."1.2N1"."2.4N)
+<Implementation><![CDATA[	Quit (DatumString?2.4N1"-"1.2N1"-"1.2N)
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/TestLeverDatum.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/TestLeverDatum.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/TestLeverDatum.cls.xml	(revision 54350)
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.EC.Unishop.OrderConfirmation.Service.ConfirmOrder.TestLeverDatum">
+<ClassType/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhUnitTest.TestCase</Super>
+
+<Parameter name="LageEDInummer">
+<Type>%Integer</Type>
+<Default>77667</Default>
+</Parameter>
+
+<Parameter name="OfferteNummer">
+<Type>%Integer</Type>
+<Default>1</Default>
+</Parameter>
+
+<Property name="EDInr">
+<Type>%Integer</Type>
+<InitialExpression>6</InitialExpression>
+</Property>
+
+<Property name="BestelReferentie">
+<Type>%String</Type>
+<InitialExpression>"UT_DummyBestelRef"</InitialExpression>
+</Property>
+
+<Property name="GevraagdeLeverdatum">
+<Type>%String</Type>
+<InitialExpression>"31-12-2099"</InitialExpression>
+</Property>
+
+<Property name="WensLeverdatum">
+<Type>%String</Type>
+<InitialExpression>"31-12-2099"</InitialExpression>
+</Property>
+
+<Property name="Huidigedatum">
+<Type>%String</Type>
+<InitialExpression>"31-12-2099"</InitialExpression>
+</Property>
+
+<Property name="Shop">
+<Type>%String</Type>
+<InitialExpression>"HFLB"</InitialExpression>
+</Property>
+
+<Property name="OfferteVanHandel">
+<Type>APPS.VKP.Offerte</Type>
+</Property>
+
+<Property name="VanHoeckeOfferte">
+<Type>vhTest.Mock.APPS.VKP.Offerte</Type>
+</Property>
+
+<Property name="DocRefsVanHoeckeOfferte">
+<Type>DOM.VKP.DocumentReferenties</Type>
+</Property>
+
+<Property name="ExterneVerkoopService">
+<Type>APPS.EC.Verkoop.ExterneVerkoopService</Type>
+</Property>
+
+<Property name="AuthorisatieControleurMock">
+<Type>vhTest.Mock.APPS.EC.Winkelkar.AuthorisatieControleur</Type>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+
+	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)
+	Do ..ZetMockECommerceAPI(VanHoeckeOfferteID)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Wensdatum wordt gezet voor Haefele indien Huidigedatum de GevraagdeLeverdatum is">
+<Implementation><![CDATA[
+	Set ..Shop = ##class(APPS.EC.enu.UniShopVerwerker).HaefeleBelgie()
+
+	Set ..GevraagdeLeverdatum  = "31-12-2089"
+	
+	Set ..WensLeverdatum  = "2079-12-31"
+	
+	Set ..Huidigedatum = "31-12-2089"
+
+	Do ..AssertLeverdatum("31-12-2079")
+]]></Implementation>
+</Method>
+
+<Method name="Test: GevraagdeLeverdatum wordt gezet voor Haefele indien Huidigedatum niet de GevraagdeLeverdatum is">
+<Implementation><![CDATA[
+	Set ..Shop = ##class(APPS.EC.enu.UniShopVerwerker).HaefeleBelgie()
+
+	Set ..GevraagdeLeverdatum  = "31-12-2089"
+	
+	Set ..WensLeverdatum  = "2079-12-31"
+	
+	Set ..Huidigedatum = "31-12-2089"
+
+	Do ..AssertLeverdatum("31-12-2079")
+]]></Implementation>
+</Method>
+
+<Method name="Test: GevraagdeLeverdatum wordt gezet voor Haefele indien Huidigedatum de GevraagdeLeverdatum is en wensdatum is verkeerd formaat">
+<Implementation><![CDATA[
+	Set ..Shop = ##class(APPS.EC.enu.UniShopVerwerker).HaefeleBelgie()
+
+	Set ..GevraagdeLeverdatum = "31-12-2089"
+	
+	Set ..WensLeverdatum = "31/12/2079"
+	
+	Set ..Huidigedatum = "31-12-2089"
+
+	Do ..AssertLeverdatum("31-12-2089")
+]]></Implementation>
+</Method>
+
+<Method name="Test: GevraagdeLeverdatum wordt gezet voor SFS">
+<Implementation><![CDATA[
+	Set ..Shop = ##class(APPS.EC.enu.UniShopVerwerker).SFS()
+
+	Set ..GevraagdeLeverdatum  = "31-12-2089"
+	
+	Set ..WensLeverdatum  = "2079-12-31"
+	
+	Set ..Huidigedatum = "31-12-2089"
+
+	Do ..AssertLeverdatum("31-12-2089")
+]]></Implementation>
+</Method>
+
+<Method name="AssertLeverdatum">
+<FormalSpec>VerwachteLeverdatum:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Do ..OfferteVanHandel.IndienMethodCall("GeefDocumentReferenties").DanReturn(##class(DOM.VKP.DocumentReferenties).%New())
+	Do ..OfferteVanHandel.IndienMethodCall("GeefID").DanReturn(..#OfferteNummer)
+	Do ..OfferteVanHandel.IndienMethodCall("IsBesteld").DanReturn(1)
+
+	Do ..VanHoeckeOfferte.IndienMethodCall("GeefExterneId",).DanReturn($$$DummyInteger)
+	Do ..VanHoeckeOfferte.IndienMethodCall("ZetDocumentReferenties",$$$ElkeWaarde).DanDoeNiks()
+	Do ..VanHoeckeOfferte.IndienMethodCall("GeefWensLeverDatum").DanReturn(..WensLeverdatum)
+	Do ..VanHoeckeOfferte.VerwachtMethodCall("ZetLeverDatum",$$INTDATE^vhLib.DataTypes(VerwachteLeverdatum)).DanDoeNiks()
+	
+	Set OfferteServiceStub = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	Do OfferteServiceStub.IndienMethodCall("GeefOfferte",..#LageEDInummer).DanReturn(..OfferteVanHandel)
+	Do OfferteServiceStub.IndienMethodCall("GeefOfferteVanVH",..OfferteVanHandel).DanReturn(..VanHoeckeOfferte)
+	
+	Set ExterneVerkoopService = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
+	Do ExterneVerkoopService.IndienMethodCall("BestelOfferte", ..VanHoeckeOfferte.GeefID(), $$$ElkeWaarde, ##class(DOM.common.enu.Personality).VanHoecke())
+	
+	Set OfferteRepositoryMock = ##class(vhTest.Mock.APPS.VKP.Offerte.OfferteRepository).%New()
+	Do OfferteRepositoryMock.IndienMethodCall("BestaatViaExterneId",..#LageEDInummer).DanReturn($$$False)
+	
+	Set IntractoInformeerderMock = ##class(vhTest.Mock.WSimpl.EC.Unishop.OrderConfirmation.Service.IntractoMelder).%New()
+	Do IntractoInformeerderMock.IndienMethodCall("UpdateCartStatus",$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks()
+	
+	Set DateTimeAPIMock = ##class(vhTest.Mock.TECH.DateTime.DateTimeAPI).%New()
+	Do DateTimeAPIMock.IndienMethodCall("CurrentDate").DanReturn($$INTDATE^vhLib.DataTypes(..Huidigedatum))
+	
+	#dim BestelOfferteResultaat As WS.EC.Unishop.OrderConfirmation.ConfirmOrderResult =..GeefOrderServiceInternal(OfferteServiceStub,ExterneVerkoopService,IntractoInformeerderMock,OfferteRepositoryMock, DateTimeAPIMock).ConfirmOrder(..#LageEDInummer,..Shop,..BestelReferentie,..GevraagdeLeverdatum)
+	
+	Do ..VanHoeckeOfferte.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="GeefOrderServiceInternal">
+<FormalSpec>OfferteService:APPS.VKP.OfferteService="",ExterneVerkoopService:APPS.EC.Verkoop.ExterneVerkoopService="",IntractoInformeerderMock:WSimpl.EC.Unishop.OrderConfirmation.Service.IntractoMelder.CartPort="",OfferteRepositoryMock:APPS.VKP.Offerte.OfferteRepository="",DateTimeAPIMock:vhTest.Mock.TECH.DateTime.DateTimeAPI=""</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, ExterneVerkoopService ,IntractoInformeerderMock, OfferteRepositoryMock, DateTimeAPIMock)
+]]></Implementation>
+</Method>
+
+<Method name="ZetMockVanHoeckeOfferte">
+<FormalSpec>VanHoeckeOfferteID:%Integer</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set ..VanHoeckeOfferte = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do ..VanHoeckeOfferte.IndienMethodCall("GeefID").DanReturn(VanHoeckeOfferteID)
+	Do ..VanHoeckeOfferte.IndienMethodCall("GeefDocumentReferenties").DanReturn(..DocRefsVanHoeckeOfferte)
+	Do ..VanHoeckeOfferte.IndienMethodCall("GeefBestelOpmerking").DanReturn("DummyBestelOpmerking")
+	Do ..VanHoeckeOfferte.IndienMethodCall("ZetBestelOpmerking","UT_DummyBestelRef - DummyBestelOpmerking")
+]]></Implementation>
+</Method>
+
+<Method name="ZetMockECommerceAPI">
+<FormalSpec>VanHoeckeOfferteID:%Integer</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim ECommerceAPIFake As vhTest.Mock.APPS.EC.ECommerceAPI = ##class(vhTest.Mock.APPS.EC.ECommerceAPI).MockInstance()
+	Do ECommerceAPIFake.IndienMethodCall("GeefExterneVerkoopService").DanReturn(..ExterneVerkoopService)
+	Do ECommerceAPIFake.IndienMethodCall("GeefWebshopSessionService").DanReturn(##class(APPS.EC.impl.WebshopSessionService).%New())
+
+	Set ..AuthorisatieControleurMock = ##class(vhTest.Mock.APPS.EC.Winkelkar.AuthorisatieControleur).%New()
+	Do ..AuthorisatieControleurMock.IndienMethodCall("ControleerWerkenMetBestellingVanHandel",VanHoeckeOfferteID)
+	Do ECommerceAPIFake.IndienMethodCall("GeefAuthorisatieControleur").DanReturn(..AuthorisatieControleurMock)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>