Index: vhUnitTest/APPS/TBXWeb/impl/VHEPNOrderHandlerMock.cls.xml
===================================================================
diff -u -r320 -r388
--- vhUnitTest/APPS/TBXWeb/impl/VHEPNOrderHandlerMock.cls.xml	(.../VHEPNOrderHandlerMock.cls.xml)	(revision 320)
+++ vhUnitTest/APPS/TBXWeb/impl/VHEPNOrderHandlerMock.cls.xml	(.../VHEPNOrderHandlerMock.cls.xml)	(revision 388)
@@ -45,5 +45,12 @@
 <Implementation><![CDATA[ 	Quit ##super()
 ]]></Implementation>
 </Method>
+
+<Method name="GeefRegioID">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit "xx-UT_KLNr_"_..GeefKLNrVoorVerwerkingVH()
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: APPS/TBXWeb/impl/VHEPNOrderHandler.cls.xml
===================================================================
diff -u -r375 -r388
--- APPS/TBXWeb/impl/VHEPNOrderHandler.cls.xml	(.../VHEPNOrderHandler.cls.xml)	(revision 375)
+++ APPS/TBXWeb/impl/VHEPNOrderHandler.cls.xml	(.../VHEPNOrderHandler.cls.xml)	(revision 388)
@@ -95,14 +95,10 @@
 <ReturnType>%List</ReturnType>
 <Implementation><![CDATA[
 	set lbMailTo = ""
-	Set DataIO = ##class(WS.TBX.DataIOSoap).%New()
-	Set Result=DataIO.PrepareGetKlant(.lbLocations,.locNdx)   ; Uses PeekServer  and  TimeOut=(120-1)sec
 	
 	Set KLNrVoorVerwerkingVH=..GeefKLNrVoorVerwerkingVH()
 	If $L(KLNrVoorVerwerkingVH) {
-		Set $ZT = "errorBijRegio"
-		Set RegioID = DataIO.GetKlantRegioID(..GeefKLNrVoorVerwerkingVH())
-		Set $ZT = ""
+		Set RegioID=..GeefRegioID()
 		Set lbMailTo = $LB("OV_WebOrder_R"_##class(TECH.StringUtils).AlignRight(RegioID,"0",2)_"@vanhoecke.be")
 	}
 	Else {
@@ -118,6 +114,19 @@
 	}
 
 	Quit lbMailTo
+]]></Implementation>
+</Method>
+
+<Method name="GeefRegioID">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set DataIO = ##class(WS.TBX.DataIOSoap).%New()
+	Set Result=DataIO.PrepareGetKlant(.lbLocations,.locNdx)   ; Uses PeekServer  and  TimeOut=(120-1)sec
+	Set $ZT = "errorBijRegio"
+	Set RegioID = DataIO.GetKlantRegioID(..GeefKLNrVoorVerwerkingVH())
+	Set $ZT = ""
+	Quit RegioID
 	
 errorBijRegio
 	Set $ZT = ""
@@ -143,7 +152,7 @@
 
 <Method name="WebServer">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[  Quit "www.tandem-box.com"
+<Implementation><![CDATA[	Quit ..GeefOrderDomein()
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/TBXWeb/impl/TestOrderHandlers.cls.xml
===================================================================
diff -u -r320 -r388
--- vhUnitTest/APPS/TBXWeb/impl/TestOrderHandlers.cls.xml	(.../TestOrderHandlers.cls.xml)	(revision 320)
+++ vhUnitTest/APPS/TBXWeb/impl/TestOrderHandlers.cls.xml	(.../TestOrderHandlers.cls.xml)	(revision 388)
@@ -82,15 +82,35 @@
 <Private>1</Private>
 </Property>
 
-<Method name="TestOrderBijVanHoecke">
+<Method name="TestAnoniemOrderBijVanHoecke">
 <Implementation><![CDATA[
 	set ..Shop = ##class(APPS.TBXWeb.enu.TBXHandel).VanHoecke()
 	set ..WebDomain = "www.tandem-box.com"
 	set ..Requester = ##class(APPS.TBXWeb.enu.TBXHandel).VanHoecke()
-	set ..KlantNr = $$$TBoxWebKlantNrVHEPN
+	set ..KlantNr = ""
+	set ..KlantNaam = "De onbekende soldaat"
+	set ..IsAnoniemeGebruiker=1
+	set ..MailTo = $listbuild("OV_TBX_ANON@vanhoecke.be")
+	set ..MailFrom = """De onbekende soldaat"" <AdminTBX@vanhoecke.be>"
+	set ..MailLanguage = ##class(DOM.enu.Taal).Nederlands()
+	set ..OrderResultType = ##class(APPS.TBXWeb.enu.BonType).OfferteAanvraag()
+	set ..Implementatie = "VHEPNOrderHandler" 
+		
+	set ..ValidBonTypes = $listbuild(##class(APPS.TBXWeb.enu.BonType).OfferteAanvraag())
+
+	do ..VoerUitTest()
+]]></Implementation>
+</Method>
+
+<Method name="TestOrderBijVanHoeckeByKlant">
+<Implementation><![CDATA[
+	set ..Shop = ##class(APPS.TBXWeb.enu.TBXHandel).VanHoecke()
+	set ..WebDomain = "www.tandem-box.com"
+	set ..Requester = ##class(APPS.TBXWeb.enu.TBXHandel).VanHoecke()
+	set ..KlantNr = 4645
 	set ..KlantNaam = "KlantNaam ("_..Requester_")"
 	set ..IsAnoniemeGebruiker=0
-	set ..MailTo = $listbuild("""OV_TBX_KLANT"" <OV_TBX_KLANT@vanhoecke.be>")
+	set ..MailTo = $listbuild("OV_WebOrder_Rxx-UT_KLNr_4645@vanhoecke.be")
 	set ..MailFrom = """KlantNaam ("_##class(APPS.TBXWeb.enu.TBXHandel).VanHoecke()_")"" <AdminTBX@vanhoecke.be>"
 	set ..MailLanguage = ##class(DOM.enu.Taal).Nederlands()
 	set ..OrderResultType = ##class(APPS.TBXWeb.enu.BonType).Bestelbon()
@@ -102,21 +122,21 @@
 ]]></Implementation>
 </Method>
 
-<Method name="TestAnoniemOrderBijVanHoecke">
+<Method name="TestOrderBijVanHoeckeByKlantSFS">
 <Implementation><![CDATA[
 	set ..Shop = ##class(APPS.TBXWeb.enu.TBXHandel).VanHoecke()
 	set ..WebDomain = "www.tandem-box.com"
 	set ..Requester = ##class(APPS.TBXWeb.enu.TBXHandel).VanHoecke()
-	set ..KlantNr = 0
-	set ..KlantNaam = "De onbekende soldaat"
-	set ..IsAnoniemeGebruiker=1
-	set ..MailTo = $listbuild("""OV_TBX_KLANT"" <OV_TBX_KLANT@vanhoecke.be>")
-	set ..MailFrom = """De onbekende soldaat"" <AdminTBX@vanhoecke.be>"
+	set ..KlantNr = $$$TBoxWebKlantNrSFS
+	set ..KlantNaam = "KlantNaam ("_..Requester_")"
+	set ..IsAnoniemeGebruiker=0
+	set ..MailTo = $listbuild("OV_WebOrder_Rxx-UT_KLNr_12486@vanhoecke.be")
+	set ..MailFrom = """KlantNaam ("_##class(APPS.TBXWeb.enu.TBXHandel).VanHoecke()_")"" <AdminTBX@vanhoecke.be>"
 	set ..MailLanguage = ##class(DOM.enu.Taal).Nederlands()
-	set ..OrderResultType = ##class(APPS.TBXWeb.enu.BonType).OfferteAanvraag()
+	set ..OrderResultType = ##class(APPS.TBXWeb.enu.BonType).Bestelbon()
 	set ..Implementatie = "VHEPNOrderHandler" 
 		
-	set ..ValidBonTypes = $listbuild(##class(APPS.TBXWeb.enu.BonType).OfferteAanvraag())
+	set ..ValidBonTypes = $listbuild(##class(APPS.TBXWeb.enu.BonType).Offerte())
 
 	do ..VoerUitTest()
 ]]></Implementation>
@@ -125,12 +145,12 @@
 <Method name="TestSFSOrderBijVanHoecke">
 <Implementation><![CDATA[
 	set ..Shop = ##class(APPS.TBXWeb.enu.TBXHandel).VanHoecke()
-	set ..WebDomain = "www.tandem-box.com"
+	set ..WebDomain = "tbx.sfsunimarket.biz"
 	set ..Requester = ##class(APPS.TBXWeb.enu.TBXHandel).SFS()
-	set ..KlantNr = $$$TBoxWebKlantNrSFS
+	set ..KlantNr = 12345678
 	set ..KlantNaam = "KlantNaam ("_..Requester_")"
 	set ..IsAnoniemeGebruiker=0
-	set ..MailTo = $listbuild("OV_TBX_SFS@vanhoecke.be")
+	set ..MailTo = $listbuild("OV_WebOrder_Rxx-UT_KLNr_12486@vanhoecke.be")
 	set ..MailFrom = """SFS TBX Inkoop"" <AdminTBX@sfsunimarket.biz>"
 	set ..MailLanguage = ##class(DOM.enu.Taal).Nederlands()
 	set ..ValidBonTypes = $listbuild(##class(APPS.TBXWeb.enu.BonType).Bestelbon())
@@ -146,12 +166,12 @@
 <Method name="TestHafeleBEOrderBijVanHoecke">
 <Implementation><![CDATA[
 	set ..Shop = ##class(APPS.TBXWeb.enu.TBXHandel).VanHoecke()
-	set ..WebDomain = "www.tandem-box.com"
+	set ..WebDomain = "tandembox.hafele.be"
 	set ..Requester = ##class(APPS.TBXWeb.enu.TBXHandel).HafeleBE()
-	set ..KlantNr = $$$TBoxWebKlantNrSFS
+	set ..KlantNr = 12345678
 	set ..KlantNaam = "KlantNaam ("_..Requester_")"
 	set ..IsAnoniemeGebruiker=0
-	set ..MailTo = $listbuild("OV_TBX_HFLB@vanhoecke.be")
+	set ..MailTo = $listbuild("OV_WebOrder_Rxx-UT_KLNr_4875@vanhoecke.be","ICT_SupportTBX@vanhoecke.be")
 	set ..MailFrom = """Hafele.be TBX Inkoop"" <AdminTBX@hafele.be>"
 	set ..MailLanguage = ##class(DOM.enu.Taal).Nederlands()
 	set ..ValidBonTypes = $listbuild(##class(APPS.TBXWeb.enu.BonType).Bestelbon())
@@ -167,12 +187,12 @@
 <Method name="TestKischOrderBijVanHoecke">
 <Implementation><![CDATA[
 	set ..Shop = ##class(APPS.TBXWeb.enu.TBXHandel).VanHoecke()
-	set ..WebDomain = "www.tandem-box.com"
+	set ..WebDomain = "tandembox.kisch.nl"
 	set ..Requester = ##class(APPS.TBXWeb.enu.TBXHandel).Kisch()
-	set ..KlantNr = $$$TBoxWebKlantNrSFS
+	set ..KlantNr = 12345678
 	set ..KlantNaam = "KlantNaam ("_..Requester_")"
 	set ..IsAnoniemeGebruiker=0
-	set ..MailTo = $listbuild("OV_TBX_KLANT@vanhoecke.be")
+	set ..MailTo = $listbuild("OV_WebOrder_Rxx-UT_KLNr_2254@vanhoecke.be")
 	set ..MailFrom = """KISCH TBX Inkoop"" <AdminTBX@kisch.nl>"
 	set ..MailLanguage = ##class(DOM.enu.Taal).Nederlands()
 	set ..ValidBonTypes = $listbuild(##class(APPS.TBXWeb.enu.BonType).Bestelbon())
@@ -188,12 +208,12 @@
 <Method name="TestMBHOOrderBijVanHoecke">
 <Implementation><![CDATA[
 	set ..Shop = ##class(APPS.TBXWeb.enu.TBXHandel).VanHoecke()
-	set ..WebDomain = "www.tandem-box.com"
+	set ..WebDomain = "tandembox.meubelbeslagholland.nl"
 	set ..Requester = ##class(APPS.TBXWeb.enu.TBXHandel).MBHolland()
-	set ..KlantNr = $$$TBoxWebKlantNrMBHO
+	set ..KlantNr = 12345678
 	set ..KlantNaam = "KlantNaam ("_..Requester_")"
 	set ..IsAnoniemeGebruiker=0
-	set ..MailTo = $listbuild("OV_TBX_MBHO@vanhoecke.be")
+	set ..MailTo = $listbuild("OV_WebOrder_Rxx-UT_KLNr_2999@vanhoecke.be","ICT_SupportTBX@vanhoecke.be")
 	set ..ValidBonTypes = $listbuild(##class(APPS.TBXWeb.enu.BonType).Bestelbon())
 	set ..MailFrom = """MBHO TBX Inkoop"" <AdminTBX@meubelbeslagholland.nl>"
 	set ..MailLanguage = ##class(DOM.enu.Taal).Nederlands()
@@ -209,12 +229,12 @@
 <Method name="TestDestilOrderBijVanHoecke">
 <Implementation><![CDATA[
 	set ..Shop = ##class(APPS.TBXWeb.enu.TBXHandel).VanHoecke()
-	set ..WebDomain = "www.tandem-box.com"
+	set ..WebDomain = "tbx.destil.nl"
 	set ..Requester = ##class(APPS.TBXWeb.enu.TBXHandel).Destil()
-	set ..KlantNr = $$$TBoxWebKlantNrHELMY
+	set ..KlantNr = ""
 	set ..KlantNaam = "KlantNaam ("_..Requester_")"
-	set ..IsAnoniemeGebruiker=0
-	set ..MailTo = $listbuild("""OV_TBX_KLANT"" <OV_TBX_KLANT@vanhoecke.be>")
+	set ..IsAnoniemeGebruiker=1
+	set ..MailTo = $listbuild("OV_WebOrder_Rxx-UT_KLNr_4598@vanhoecke.be")
 	set ..MailLanguage = ##class(DOM.enu.Taal).Nederlands()
 	set ..ValidBonTypes = $listbuild(##class(APPS.TBXWeb.enu.BonType).Bestelbon())
 	set ..MailFrom = """Destil TBX Inkoop"" <AdminTBX@destil.nl>"
@@ -230,13 +250,13 @@
 <Method name="TestOptimaOrderBijVanHoecke">
 <Implementation><![CDATA[
 	set ..Shop = ##class(APPS.TBXWeb.enu.TBXHandel).VanHoecke()
-	set ..WebDomain = "www.tandem-box.com"
+	set ..WebDomain = "www.optima-tbx.fr"
 	set ..Requester = ##class(APPS.TBXWeb.enu.TBXHandel).Optima()
-	set ..KlantNr = $$$TBoxWebKlantNrOPTIMA
+	set ..KlantNr = 12345678
 	set ..KlantNaam = "KlantNaam ("_..Requester_")"
 	set ..IsAnoniemeGebruiker=0
 	set ..MailLanguage = ##class(DOM.enu.Taal).Nederlands()
-	set ..MailTo = $listbuild("""OV_TBX_KLANT"" <OV_TBX_KLANT@vanhoecke.be>")
+	set ..MailTo = $listbuild("OV_WebOrder_Rxx-UT_KLNr_6279@vanhoecke.be","ICT_SupportTBX@vanhoecke.be")   ; $listbuild("""OV_TBX_OPTIMA"" <OV_TBX_OPTIMA@vanhoecke.be>")
 	set ..ValidBonTypes = $listbuild(##class(APPS.TBXWeb.enu.BonType).Bestelbon())
 	set ..MailFrom = """Extern TBX Aankoop"" <AdminTBX@vanhoecke.be>"
     set ..OrderResultType = ##class(APPS.TBXWeb.enu.BonType).Inkooporder()
@@ -253,7 +273,7 @@
 	set ..Shop = ##class(APPS.TBXWeb.enu.TBXHandel).SFS()
 	set ..WebDomain = "tbx.sfsunimarket.biz"
 	set ..Requester = ##class(APPS.TBXWeb.enu.TBXHandel).SFS()
-	set ..KlantNr = $$$TBoxWebKlantNrSFS
+	set ..KlantNr = 12345678
 	set ..KlantNaam = "KlantNaam ("_..Requester_")"
 	set ..IsAnoniemeGebruiker=0
 	set ..MailTo = ""
@@ -274,7 +294,7 @@
 	set ..Shop = ##class(APPS.TBXWeb.enu.TBXHandel).Kisch()
 	set ..WebDomain = "tandembox.kisch.nl"
 	set ..Requester = ##class(APPS.TBXWeb.enu.TBXHandel).Kisch()
-	set ..KlantNr = $$$TBoxWebKlantNrKISCH
+	set ..KlantNr = 12345678
 	set ..KlantNaam = "KlantNaam ("_..Requester_")"
 	set ..IsAnoniemeGebruiker=0
 	set ..MailTo = $listbuild("""KISCH OV."" <hvt@kisch.nl>", """KISCH OV."" <mgroot@kisch.nl>")
@@ -295,7 +315,7 @@
 	set ..Shop = ##class(APPS.TBXWeb.enu.TBXHandel).MBHolland()
 	set ..WebDomain = "tandembox.meubelbeslagholland.nl"
 	set ..Requester = ##class(APPS.TBXWeb.enu.TBXHandel).MBHolland()
-	set ..KlantNr = $$$TBoxWebKlantNrMBHO
+	set ..KlantNr = 12345678
 	set ..KlantNaam = "KlantNaam ("_..Requester_")"
 	set ..IsAnoniemeGebruiker=0
 	set ..MailTo = $listbuild("""MBHO OV."" <info@meubelbeslagholland.nl>")
@@ -316,7 +336,7 @@
 	set ..Shop = ##class(APPS.TBXWeb.enu.TBXHandel).Optima()
 	set ..WebDomain = "www.optima-tbx.fr"
 	set ..Requester = ##class(APPS.TBXWeb.enu.TBXHandel).Optima()
-	set ..KlantNr = $$$TBoxWebKlantNrOPTIMA
+	set ..KlantNr = 12345678
 	set ..KlantNaam = "KlantNaam ("_..Requester_")"
 	set ..IsAnoniemeGebruiker=0
 	set ..MailTo = $listbuild("""LMC OV."" <tandembox@lmc.tm.fr>")
@@ -337,7 +357,7 @@
 	set ..Shop = ##class(APPS.TBXWeb.enu.TBXHandel).Destil()
 	set ..WebDomain = "tbx.destil.nl"
 	set ..Requester = ##class(APPS.TBXWeb.enu.TBXHandel).Destil()
-	set ..KlantNr = $$$TBoxWebKlantNrHELMY
+	set ..KlantNr = ""
 	set ..KlantNaam = "KlantNaam ("_..Requester_")"
 	set ..IsAnoniemeGebruiker=0
 	set ..MailTo = $listbuild("""Destil OV."" <interieurbouw@destil.nl>","""Twan Peters"" <t.peters@destil.nl>")
@@ -353,7 +373,14 @@
 ]]></Implementation>
 </Method>
 
-<Method name="TestOrderBijHein">
+<UDLText name="T">
+<Content><![CDATA[
+/*   * /
+/*   */
+]]></Content>
+</UDLText>
+
+<Method name="TestOrderBijHeinOFF">
 <Implementation><![CDATA[
 	set ..Shop = ##class(APPS.TBXWeb.enu.TBXHandel).Hein()
 	set ..WebDomain = "tbx.tandem-box.de"
@@ -365,10 +392,42 @@
 	set ..MailFrom = """KlantNaam (HEIN)"" <AdminTBX@vanhoecke.be>"
 	set ..MailLanguage = ##class(DOM.enu.Taal).Duits()
 	set ..ValidBonTypes = $listbuild(##class(APPS.TBXWeb.enu.BonType).Offerte())
+	set ..OrderResultType = ##class(APPS.TBXWeb.enu.BonType).Offerte()
+	set ..Implementatie = "HEINOrderHandler" 
+	
+	do ..VoerUitOrderTestVoorBonType(##class(APPS.TBXWeb.enu.BonType).OfferteAanvraag())
+	do ..VoerUitOrderTestVoorBonType(##class(APPS.TBXWeb.enu.BonType).Offerte())
+	do ..VoerUitOrderTestVoorBonType(##class(APPS.TBXWeb.enu.BonType).Inkooporder())
+
+	do ..VoerUitGOTestVoorBonType(##class(APPS.TBXWeb.enu.BonType).OfferteAanvraag())
+	do ..VoerUitGOTestVoorBonType(##class(APPS.TBXWeb.enu.BonType).Offerte())
+	do ..VoerUitGOTestVoorBonType(##class(APPS.TBXWeb.enu.BonType).Inkooporder())
+	quit
+]]></Implementation>
+</Method>
+
+<Method name="TestOrderBijHeinBBON">
+<Implementation><![CDATA[
+	set ..Shop = ##class(APPS.TBXWeb.enu.TBXHandel).Hein()
+	set ..WebDomain = "tbx.tandem-box.de"
+	set ..Requester = ##class(APPS.TBXWeb.enu.TBXHandel).Hein()
+	set ..KlantNr = $$$TBoxWebKlantNrHEIN
+	set ..KlantNaam = "KlantNaam ("_..Requester_")"
+	set ..IsAnoniemeGebruiker=0
+	set ..MailTo = $listbuild("""HEIN OV."" <auftrag@tandem-box.de>")
+	set ..MailFrom = """KlantNaam (HEIN)"" <AdminTBX@vanhoecke.be>"
+	set ..MailLanguage = ##class(DOM.enu.Taal).Duits()
+	set ..ValidBonTypes = $listbuild(##class(APPS.TBXWeb.enu.BonType).Bestelbon())
 	set ..OrderResultType = ##class(APPS.TBXWeb.enu.BonType).Bestelbon()
 	set ..Implementatie = "HEINOrderHandler" 
 	
-	do ..VoerUitTest()
+	do ..VoerUitOrderTestVoorBonType(##class(APPS.TBXWeb.enu.BonType).OfferteAanvraag())
+	do ..VoerUitOrderTestVoorBonType(##class(APPS.TBXWeb.enu.BonType).Bestelbon())
+	do ..VoerUitOrderTestVoorBonType(##class(APPS.TBXWeb.enu.BonType).Inkooporder())
+
+	do ..VoerUitGOTestVoorBonType(##class(APPS.TBXWeb.enu.BonType).OfferteAanvraag())
+	do ..VoerUitGOTestVoorBonType(##class(APPS.TBXWeb.enu.BonType).Bestelbon())
+	do ..VoerUitGOTestVoorBonType(##class(APPS.TBXWeb.enu.BonType).Inkooporder())
 	
 	quit
 ]]></Implementation>
@@ -433,10 +492,12 @@
 	
 	if $$$AssertTrue(##class(TECH.StringUtils).StartsWith(impl.%ClassName(),..Implementatie),"controle implementatie "_..Requester) {
 		do $$$AssertEquals(impl.WebServer(),..WebDomain,"Webserver voor "_..Requester)
-		do $$$AssertEquals(impl.GetOrderResultType(),..OrderResultType,"OrderResultType voor "_..Requester)
 		
 		do ..ControleBonType(impl,BonType)
 		do ..ControleFoutInLijnen(impl,AbstractOrderID)
+		if ..IsValidBonType(BonType) {
+			do $$$AssertEquals(impl.GetOrderResultType(),..OrderResultType,"OrderResultType voor "_..Requester)
+		}
 			
 		;do $$$AssertEquals(impl.GebruiktEmail(),$length(..MailFrom)>0,"de unittest data is consistent opgesteld")
 		;do $$$AssertEquals(impl.GebruiktEmail(),$length(..MailTo)>0,"de unittest data is consistent opgesteld")
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()