Index: WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml
===================================================================
diff -u -r53429 -r54344
--- WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml	(.../Service.cls.xml)	(revision 53429)
+++ WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml	(.../Service.cls.xml)	(revision 54344)
@@ -33,6 +33,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="FormatAPI">
+<Type>TECH.Format.FormatAPI</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>
 <Private>1</Private>
@@ -46,6 +51,8 @@
 	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()
+
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -72,7 +79,9 @@
 		Do ##class(vhLib.Logger).%New().Info("ConfirmOrder Unishop","Shop '"_Shop_"' - OfferteVanHandel '"_EDInr_"'  - VanHoeckeOfferteID '"_VanHoeckeOfferteID_"'.")
 		
 		;Do ..AuthorisatieControleur.ControleerWerkenMetBestellingVanHandel(VanHoeckeOfferteID)
-		Do ..VerwerkInputParameters(VanHoeckeOfferte,BestelReferentie,GevraagdeLeverdatum)
+		
+		Do ..VerwerkInputParameters(VanHoeckeOfferte,BestelReferentie,GevraagdeLeverdatum, Shop)
+		
 		Do ..VerwerkReferenties(OfferteVanHandel, VanHoeckeOfferte)
 		
 		Do ..ExterneVerkoopService.BestelOfferte(VanHoeckeOfferteID,KlantID,PersonalityID)
@@ -112,10 +121,17 @@
 </Method>
 
 <Method name="VerwerkInputParameters">
-<FormalSpec>VanHoeckeOfferte:APPS.VKP.impl.Offerte,BestelReferentie:%String,GevraagdeLeverdatum:%String</FormalSpec>
+<FormalSpec>VanHoeckeOfferte:APPS.VKP.impl.Offerte,BestelReferentie:%String,GevraagdeLeverdatum:%String,Shop:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	Do VanHoeckeOfferte.ZetLeverDatum($$INTDATE^vhLib.DataTypes(GevraagdeLeverdatum))
+	#dim LeverDatum As %Date = $$INTDATE^vhLib.DataTypes(GevraagdeLeverdatum)
+	#dim HuidigeDatum As %Date = ##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate()
+	
+	If ((Shop = ##class(APPS.EC.enu.UniShopVerwerker).HaefeleBelgie()) && (LeverDatum = HuidigeDatum)) {
+		Do VanHoeckeOfferte.ZetLeverDatum(..BepaalLeverDatum(VanHoeckeOfferte.GeefWensLeverDatum(),LeverDatum))
+	} Else {
+		Do VanHoeckeOfferte.ZetLeverDatum(LeverDatum)
+	}
 
 	#dim DocumentReferenties As DOM.VKP.DocumentReferenties = VanHoeckeOfferte.GeefDocumentReferenties()
 	Set DocumentReferenties.KlantOrderNummer=BestelReferentie
@@ -128,6 +144,33 @@
 ]]></Implementation>
 </Method>
 
+<Method name="BepaalLeverDatum">
+<FormalSpec>WensLeverDatum:%String,VoorgesteldeLeverdatum:%Date</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Date</ReturnType>
+<Implementation><![CDATA[
+	#dim LeverDatum As %Date = VoorgesteldeLeverdatum
+	
+	If (..WensLeverDatumHeeftGeldigFormaat(WensLeverDatum)) {
+		Try {
+			Set LeverDatum = $ZDateH($Translate(WensLeverDatum,".","/"),4)
+		} Catch {
+			Do ##class(TECH.ExceptionHandler).Catch()
+		}
+	}
+	
+	Quit LeverDatum
+]]></Implementation>
+</Method>
+
+<Method name="WensLeverDatumHeeftGeldigFormaat">
+<FormalSpec>DatumString:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (DatumString?1.2N1"."1.2N1"."2.4N)
+]]></Implementation>
+</Method>
+
 <Method name="GeefAantalProductieDagen">
 <Private>1</Private>
 <ReturnType>%Integer</ReturnType>