Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/Daro.cls.xml
===================================================================
diff -u -r55904 -r64538
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/Daro.cls.xml	(.../Daro.cls.xml)	(revision 55904)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/Daro.cls.xml	(.../Daro.cls.xml)	(revision 64538)
@@ -10,7 +10,11 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Do ##super(Logger,OfferteGenerator,HttpPoster)
+	#dim DaroOfferteGenerator As APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.OfferteGenerator.Daro = ""
+	if (##class(DOM.DomeinContext).Instance().GeefProjectSettingsAPI().IsDaroExcludeFromDeliveryEnabled()) {
+		Set DaroOfferteGenerator = $$$Inject(OfferteGenerator,##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.OfferteGenerator.Daro).%New())
+	}
+	Do ##super(Logger,$$$Inject(DaroOfferteGenerator,OfferteGenerator),HttpPoster)
 
 	If ..RunsInTestmode() {
 		//Set ..HttpPoster = ##class(TECH.Http.impl.Poster).%New()
@@ -32,20 +36,22 @@
 <Private>1</Private>
 <ReturnType>TECH.Http.Message</ReturnType>
 <Implementation><![CDATA[
-	#dim ProductieServer As %String = "daro-site.beebo.co.uk"
-	#dim TestServerIP As %String = "daro-site.beebo.co.uk"
+	#dim ProductieServer As %String = "ax-loadbalancer.vanhoecke.be" ;was vroeger (pre TLS1.2) "www.daro.com"
+	#dim TestServerIP As %String = "ax-loadbalancer.vanhoecke.be"	 ;was vroeger (pre TLS1.2) "daro-site.beebo.co.uk"
 
 	#dim HttpMessage As TECH.Http.Message = ##class(TECH.Http.Message).%New()
 
 	If ..RunsInTestmode() { 
 		Set HttpMessage.Server = TestServerIP
 		Set HttpMessage.Username = "daro"
 		Set HttpMessage.Password = "daro2017"
+		Set HttpMessage.Location = "Daro-test/configurator/webhook"
 	} Else {
 		Set HttpMessage.Server = ProductieServer
+		Set HttpMessage.Location = "Daro-prod/configurator/webhook"
 	}
 	
-	Set HttpMessage.Location = "/configurator/webhook"
+	
 	Set HttpMessage.ContentType = "text/xml"
 	Set HttpMessage.ContextEncoding = "UTF-8"
 	Set HttpMessage.Data = XMLStream