Index: APPS/TBXWeb/impl/AbstractOrderHandler.cls.xml
===================================================================
diff -u -r33 -r320
--- APPS/TBXWeb/impl/AbstractOrderHandler.cls.xml	(.../AbstractOrderHandler.cls.xml)	(revision 33)
+++ APPS/TBXWeb/impl/AbstractOrderHandler.cls.xml	(.../AbstractOrderHandler.cls.xml)	(revision 320)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
 <Class name="APPS.TBXWeb.impl.AbstractOrderHandler">
+<ClassType/>
 <IncludeCode>vhLib.Macro,APPS.TBXWeb</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
@@ -10,12 +11,12 @@
 <Default>0</Default>
 </Parameter>
 
-<Property name="lbLineErrors">
-<Type>%List</Type>
+<Property name="LijnenMetFout">
+<Type>%ListOfDataTypes</Type>
 </Property>
 
 <Property name="WSOrd">
-<Type>WS.TBX.Order</Type>
+<Type>WS.TBX.OrderAbstract</Type>
 </Property>
 
 <Property name="Shop">
@@ -26,26 +27,28 @@
 <Type>APPS.TBXWeb.enu.TBXHandel</Type>
 </Property>
 
+<Property name="IsOrderVanAnoniemeGebruiker">
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="Taal">
 <Type>%String</Type>
+<Parameter name="TRUNCATE" value="1"/>
 </Property>
 
 <Property name="Logger">
 <Type>vhLib.Logger</Type>
+<Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<Description><![CDATA[
-This callback method is invoked by the <METHOD>%New</METHOD> method to 
-provide notification that a new instance of an object is being created.
-
-<P>If this method returns an error then the object will not be created.]]></Description>
 <FormalSpec>wsID:%String,Shop:APPS.TBXWeb.enu.TBXHandel="",Requester:APPS.TBXWeb.enu.TBXHandel=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set ..WSOrd=##class(WS.TBX.Order).%OpenId(wsID)
+	Set ..WSOrd = ##class(WS.TBX.OrderAbstract).%OpenId(wsID)
 	
 	Set ..Logger = ##class(APPS.TBXWeb.impl.Logger).%New()
 	
@@ -54,12 +57,15 @@
 	
 	Set ..Shop = Shop
 	Set ..Requester = Requester 
+	Set ..IsOrderVanAnoniemeGebruiker=(..WSOrd.KLNummer="")||(..WSOrd.KLNummer=0)
 	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="ProcessOrder">
+<Final>1</Final>
+<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Do ..Logger.Info("PREPROCESSING_STARTED")
 	; Preprocessing uitvoeren alvorens verdere verwerking ; Indien pre processing errors --> quiten
@@ -80,16 +86,18 @@
 	. Do ..Logger.ErrorMail("WEBDOMAIN_INVALID",Info) 
 	
 	; testen of order lijnen bevat die niet konden berekend worden.
-	Set ..lbLineErrors = ..DetectLineErrors(..WSOrd)
+	Set ..LijnenMetFout = ..GeefLijnenMetFout()
 	; indien parameter stop bij lijn fouten actief 
-	If (..#HaltOnLineErrors && $LL(..lbLineErrors) ) Do  Quit $$$ERROR($$$GeneralError,"Error in several lines")
-	. Do ..Logger.Error("TBX_LINE_ERRORS",..WSOrd.mID _" "_ $$$LCVT(lbLineErrors)) 
+	If (..#HaltOnLineErrors) && (..LijnenMetFout.Count()) Do  Quit $$$ERROR($$$GeneralError,"Error in several lines")
+	. Do ..Logger.ErrorMail("TBX_LINE_ERRORS",..WSOrd.mID _" ("_ ##class(TECH.ListUtils).ListToPieces(..LijnenMetFout,", ")_")") 
 	
 	Set NewBT = ..GetOrderResultType() ; order type wijzigen alvorens bon te bewaren	
-	If (NewBT'=..WSOrd.BonType) Do
-	. Set OldBT = ..WSOrd.BonType
-	. Set ..WSOrd.BonType = NewBT
-	. Do ..Logger.Info("BONTYPE_SET",OldBT _ " ---> " _ NewBT) 
+	
+	If (NewBT'=..WSOrd.BonType) {
+		Set OldBT = ..WSOrd.BonType
+		Do ..WSOrd.ZetBonType(NewBT)
+		Do ..Logger.Info("BONTYPE_SET",OldBT _ " ---> " _ NewBT) 
+	}
 
 	if (..Shop = "VHEPN") && (..Requester'="VHEPN" ) {
 		Do ..WSOrd.AddToSubmitToVHLog("1")
@@ -98,8 +106,7 @@
 	}
 	
 	; bon bewaren
-	Set stSaved = 1
-	Set stSaved = ..WSOrd.%Save()
+	Set stSaved = ..BewaarOrder()
 	If 'stSaved Do  Quit stSaved
 	. Do ..Logger.ErrorMail("SAVE_ORDER_FAILED",$$ParseStatus^vhLib.System(stSaved)) 
 	Do ..Logger.Info("ORDER_SAVED") 
@@ -117,18 +124,11 @@
 </Method>
 
 <Method name="IsValidWebDomain">
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $LG(..WSOrd.DomainLookUp(..WSOrd.WebDomain,$LB("VERW")),1) = ..Requester
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit $listget(##class(APPS.TBXWeb.TBXContext).GeefDomeinData(..WSOrd.WebDomain,$LB("VERW")),1) = ..Requester
 ]]></Implementation>
 </Method>
 
-<Method name="GetOrderResultType">
-<Abstract>1</Abstract>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	
-]]></Implementation>
-</Method>
-
 <Method name="PreProcessing">
 <Private>1</Private>
 <ReturnType>%Status</ReturnType>
@@ -143,30 +143,36 @@
 ]]></Implementation>
 </Method>
 
+<Method name="BewaarOrder">
+<Private>1</Private>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[ 	Quit ..WSOrd.%Save()
+]]></Implementation>
+</Method>
+
 <Method name="OrderStartTypeValid">
-<Abstract>1</Abstract>
-<ReturnType>Boolean</ReturnType>
-<Implementation><![CDATA[ 	Quit 0
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..WSOrd.BonType?1(1"OFF")
 ]]></Implementation>
 </Method>
 
 <Method name="OrderIsReedsBesteld">
 <Private>1</Private>
-<ReturnType>Boolean</ReturnType>
+<ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[ 	Quit ..WSOrd.BonType?1(1"INKP")
 ]]></Implementation>
 </Method>
 
-<Method name="DetectLineErrors">
-<FormalSpec>WSOrd</FormalSpec>
+<Method name="GetOrderResultType">
+<Abstract>1</Abstract>
+<ReturnType>%String</ReturnType>
+</Method>
+
+<Method name="GeefLijnenMetFout">
 <Private>1</Private>
-<ReturnType>%List</ReturnType>
-<Implementation><![CDATA[
-	Set lbWSErrs=""
-	Set i=""
-	For  Set WSLn=WSOrd.Lijnen.GetNext(.i) Quit:(i="")  Do
-	. Set:(WSLn.KostPrijs["ERROR") lbWSErrs=lbWSErrs_$LB(i)
-	Quit lbWSErrs
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[	quit ..WSOrd.GeefLijnenMetFout()
 ]]></Implementation>
 </Method>
 
@@ -210,87 +216,88 @@
 
 <Method name="GetMailTo">
 <Abstract>1</Abstract>
+<Private>1</Private>
 <ReturnType>%List</ReturnType>
 </Method>
 
 <Method name="GetMailSubject">
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-  
   Set Taal = ..GetMailLanguage()
-  
-  Set ServerPrefix = ""
-  #If ($$$Server["WWW")&&($$$NSpace'="HADEV") 
-   Set ServerPrefix="["_$$$Server_" - "_$$$NSpace_"] "	
-  #EndIf
-  
   Set:$L(..WSOrd.BonType) BonType = $$$Vertaling(..WSOrd.BonType,Taal)
   
-  Set Subject = ServerPrefix_"TBox - "_BonType_" - "_$ZDT($H,4)_""
-  
+  Set Subject = "TBox - "_BonType_" - "_$ZDT($H,4)_""
   Quit Subject
 ]]></Implementation>
 </Method>
 
 <Method name="GetMailLanguage">
 <Abstract>1</Abstract>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[ 
-]]></Implementation>
 </Method>
 
 <Method name="WebServer">
 <Abstract>1</Abstract>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	
-]]></Implementation>
 </Method>
 
 <Method name="WebPath">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	
- #If ($$$Server["WWW")&&($$$NSpace'="DEMO")
-  Quit "VHISIE/TBX"
- #Else
-  Quit "VHISIEDEMO/TBX"
- #EndIf
+<Implementation><![CDATA[	Quit "VHISIE/TBX"
 ]]></Implementation>
 </Method>
 
 <Method name="GetMailBody">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-  
-  Set KLNr = ..WSOrd.KLNummer
-  Set wsID = ..WSOrd.mID
-  
-  Set Taal = ..GetMailLanguage()
-  
-  Set Body = ""
-  Set Body = Body_$$$Vertaling("OH_CAUTION",Taal)_$C(13,10)
+  set Body = ""
+  Set Body = Body_$$$Vertaling("OH_CAUTION",..GetMailLanguage())_$C(13,10)
   Set Body = Body_$C(13,10)
-  Set Body = Body_$$$Vertaling("OH_WebRequest",Taal)_" : "_$C(13,10)
+  Set Body = Body_$$$Vertaling("OH_WebRequest",..GetMailLanguage())_" : "_$C(13,10)
   
-  Set Body = Body_"      "_("http://"_..WSOrd.WebDomain_"/"_..WebPath()_"/"_"Main.csp?Taal="_Taal_"&REF="_$$CreateHashedRef^cspBasis.TBX.DecodeURL.tmpDev($LB(KLNr,..Shop,wsID,"PROCESS")))_" ["_KLNr_"\"_..Shop_"\"_wsID_"\PROCESS]"_$C(13,10)
+  Set Body = Body_"      "_..GetURL()_" ["_..WSOrd.KLNummer_"\"_..Shop_"\"_..WSOrd.mID_"\PROCESS]"_$C(13,10)
   
   Set Body = Body_""_$C(13,10)
 
-  Do ..InsertExtraInfoBody(.Body,Taal)
+  Do ..InsertExtraInfoBody(.Body,..GetMailLanguage())
 
   Set Body = Body_"--- End of message ---"_$C(13,10)
   
   Quit Body
 ]]></Implementation>
 </Method>
 
+<Method name="GetURL">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	set Server = ..WSOrd.WebDomain
+  	if ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("cspBasis.Library_TestDomeinenOmzetten") {
+	  	set Server = ##class(APPS.TBXWeb.TestUtils).GeefTestDomeinNaam(..WSOrd.WebDomain)
+ 	}
+   	set URL = "http://"_Server_"/"_..WebPath()_"/"_"Main.csp?Taal="_..GetMailLanguage()_"&REF="_..GetHashedRef()
+  	
+  	quit URL
+]]></Implementation>
+</Method>
+
+<Method name="GetHashedRef">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	set lbInfo = $listbuild(..WSOrd.KLNummer,..Shop,..WSOrd.mID,"PROCESS")
+	quit $$CreateHashedRef^cspBasis.TBX.DecodeURL.tmpDev(lbInfo)
+]]></Implementation>
+</Method>
+
 <Method name="InsertExtraInfoBody">
 <FormalSpec><![CDATA[&Body:%String,Language:%String="N"]]></FormalSpec>
 <Implementation><![CDATA[
 	
-  If $LL(..lbLineErrors) Do
+  If ..LijnenMetFout.Count() Do
   . Set Body=Body_$$$Vertaling("OH_LineErrorsTitle",Language)_$C(13,10)
-  . Set Body=Body_"  "_$$$Vertaling("OH_LineErrorsData",Language)_$$$LCVT(..lbLineErrors)_$C(13,10)
+  . Set Body=Body_"  "_$$$Vertaling("OH_LineErrorsData",Language)_" ("_ ##class(TECH.ListUtils).ListToPieces(..LijnenMetFout,", ")_")"_$C(13,10)
   . Set Body=Body_""_$C(13,10)
   If $L($$$Trim(..WSOrd.Opmerking1)) Do
   . Set Body=Body_$$$Vertaling("OH_Remarks",Language)_" : "_$C(13,10)