Index: APPS/TBXWeb/impl/AbstractOrderHandler.cls.xml
===================================================================
diff -u -r337 -r388
--- APPS/TBXWeb/impl/AbstractOrderHandler.cls.xml	(.../AbstractOrderHandler.cls.xml)	(revision 337)
+++ APPS/TBXWeb/impl/AbstractOrderHandler.cls.xml	(.../AbstractOrderHandler.cls.xml)	(revision 388)
@@ -82,7 +82,7 @@
 	. Do ..Logger.ErrorMail("ORDERSTARTTYPE_INVALID",..WSOrd.%Id()_" : "_..WSOrd.BonType) 
 	
 	If '(..IsValidWebDomain()) Do  Quit $$$ERROR($$$GeneralError,"WSOrder has no valid WebDomain for this shop")
-	. Set Info = "WSOrd.WebDomain = *"_..WSOrd.WebDomain _"* "_"Requester = *"_..Requester_"*"
+	. Set Info = "WSOrd.WebDomain = *"_..GeefOrderDomein() _"* "_"Requester = *"_..Requester_"*"
 	. Do ..Logger.ErrorMail("WEBDOMAIN_INVALID",Info) 
 	
 	; testen of order lijnen bevat die niet konden berekend worden.
@@ -118,7 +118,7 @@
 	. Do ..Logger.ErrorMail("POSTPROCESSING_FAILED",$$ParseStatus^vhLib.System(stPostProcessing)) 
 	. Set lbExtras=""
 	. Set lbExtras=lbExtras_$LB(..%ClassName(0))
-	. Do ##class(cspBasis.GAProdTBox).AddToLog("SUBMIT_FAILED",..WSOrd.WebDomain,..WSOrd.KLNummer,"shop="_..Shop,..WSOrd.mID,..Requester,..Taal,,lbExtras)
+	. Do ##class(cspBasis.GAProdTBox).AddToLog("SUBMIT_FAILED",..GeefOrderDomein(),..WSOrd.KLNummer,"shop="_..Shop,..WSOrd.mID,..Requester,..Taal,,lbExtras)
 	
 	Do ..Logger.Info("ORDER_PROCESSED")
 	
@@ -128,7 +128,7 @@
 
 <Method name="IsValidWebDomain">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit $listget(##class(APPS.TBXWeb.TBXContext).GeefDomeinData(..WSOrd.WebDomain,$LB("VERW")),1) = ..Requester
+<Implementation><![CDATA[	Quit $listget(##class(APPS.TBXWeb.TBXContext).GeefDomeinData(..GeefOrderDomein(),$LB("VERW")),1) = ..Requester
 ]]></Implementation>
 </Method>
 
@@ -172,6 +172,14 @@
 <ReturnType>%String</ReturnType>
 </Method>
 
+<Method name="GeefOrderDomein">
+<Final>1</Final>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..WSOrd.WebDomain
+]]></Implementation>
+</Method>
+
 <Method name="GeefLijnenMetFout">
 <Private>1</Private>
 <ReturnType>%ListOfDataTypes</ReturnType>
@@ -200,7 +208,7 @@
 	. Set:($L($G(From))) lbExtras=lbExtras_$LB("MailFrom="_$TR(From,"""","")) 
 	. Set:($L($G(lbTo))) lbExtras=lbExtras_$LB("MailTo="_MailTo)
 	. Set:($L(..WSOrd.Opmerking1)) lbExtras=lbExtras_$LB("MailComment="_..WSOrd.Opmerking1)
-	. Do ##class(cspBasis.GAProdTBox).AddToLog("MAIL_SEND",..WSOrd.WebDomain,..WSOrd.KLNummer,"shop="_..Shop,..WSOrd.mID,VERW,$G(Taal),,lbExtras)
+	. Do ##class(cspBasis.GAProdTBox).AddToLog("MAIL_SEND",..GeefOrderDomein(),..WSOrd.KLNummer,"shop="_..Shop,..WSOrd.mID,VERW,$G(Taal),,lbExtras)
 	. Set Info = "From="_From_" To="_$$$LCVT(lbTo)
 	. Do ..Logger.Info("MAIL_SEND",Info)
 	Else  Do
@@ -276,9 +284,9 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	set Server = ..WSOrd.WebDomain
+	set Server = ..WebServer()
   	if ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("cspBasis.Library_TestDomeinenOmzetten") {
-	  	set Server = ##class(APPS.TBXWeb.TestUtils).GeefTestDomeinNaam(..WSOrd.WebDomain)
+	  	set Server = ##class(APPS.TBXWeb.TestUtils).GeefTestDomeinNaam(Server)
  	}
    	set URL = "http://"_Server_"/"_..WebPath()_"/"_"Main.csp?Taal="_..GetMailLanguage()_"&REF="_..GetHashedRef()