Index: APPS/TBXWeb/impl/AbstractOrderHandler.cls.xml
===================================================================
diff -u -r10 -r33
--- APPS/TBXWeb/impl/AbstractOrderHandler.cls.xml	(.../AbstractOrderHandler.cls.xml)	(revision 10)
+++ APPS/TBXWeb/impl/AbstractOrderHandler.cls.xml	(.../AbstractOrderHandler.cls.xml)	(revision 33)
@@ -19,11 +19,11 @@
 </Property>
 
 <Property name="Shop">
-<Type>%String</Type>
+<Type>APPS.TBXWeb.enu.TBXHandel</Type>
 </Property>
 
 <Property name="Requester">
-<Type>%String</Type>
+<Type>APPS.TBXWeb.enu.TBXHandel</Type>
 </Property>
 
 <Property name="Taal">
@@ -40,14 +40,14 @@
 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:%String="",Requester:%String=""</FormalSpec>
+<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 ..Logger = ##class(Logger).%New()
+	Set ..Logger = ##class(APPS.TBXWeb.impl.Logger).%New()
 	
 	If '$IsObject(..WSOrd) Do  Quit $$$ERROR($$$GeneralError,"wsID could not be opened")
 	. Do ..Logger.ErrorMail("WSORD_OPEN_FAIDED","wsID="_$G(wsID)_"Shop="_Shop_" ")
@@ -67,12 +67,16 @@
 	If $$$ISERR(stPreProcessing) Do  Quit $$$ERROR($$$GeneralError,"Preprocessing error")
 	. Do ..Logger.ErrorMail("PREPROCESSING_FAILED",$$ParseStatus^vhLib.System(stPreProcessing)) 
 	
+	; Order is reeds besteld
+	If (..OrderIsReedsBesteld()) Do  Quit $$$ERROR($$$errOrderAlreadyConfirmed,"WSOrder is already confirmed")
+	. Do ..Logger.ErrorMail("ORDERSTARTTYPE_INVALID",..WSOrd.%Id()_" : "_..WSOrd.BonType) 
+	
 	; Ordertype order niet van het juiste begin type
-	If $$$ISERR(..OrderStartTypeValid()) Do  Quit $$$ERROR($$$errStartTypeIncorrect,"WSOrder start type not correct")
+	If $$$Not(..OrderStartTypeValid()) Do  Quit $$$ERROR($$$errStartTypeIncorrect,"WSOrder start type not correct")
 	. 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 _"* "_"Domain Shop = *"_..WebServer()_"*"
+	. Set Info = "WSOrd.WebDomain = *"_..WSOrd.WebDomain _"* "_"Requester = *"_..Requester_"*"
 	. Do ..Logger.ErrorMail("WEBDOMAIN_INVALID",Info) 
 	
 	; testen of order lijnen bevat die niet konden berekend worden.
@@ -101,7 +105,7 @@
 	Do ..Logger.Info("ORDER_SAVED") 
 	
 	; Post processing verwerking starten -> indien post processing errors --> quiten
-	Do ..Logger.Info("POSTPROCESSING_STARTED")  
+	Do ..Logger.Info("POSTPROCESSING_STARTED") 
 	Set stPostProcessing = ..PostProcessing()
 	if 'stPostProcessing Do  Quit $$$ERROR($$$GeneralError,"Post processing error")
 	. Do ..Logger.ErrorMail("POSTPROCESSING_FAILED",$$ParseStatus^vhLib.System(stPostProcessing)) 
@@ -146,6 +150,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="OrderIsReedsBesteld">
+<Private>1</Private>
+<ReturnType>Boolean</ReturnType>
+<Implementation><![CDATA[ 	Quit ..WSOrd.BonType?1(1"INKP")
+]]></Implementation>
+</Method>
+
 <Method name="DetectLineErrors">
 <FormalSpec>WSOrd</FormalSpec>
 <Private>1</Private>
@@ -185,6 +196,7 @@
 	Else  Do
 	. Set Info = "From="_From_" To="_$$$LCVT(lbTo)
 	. Do ..Logger.ErrorMail("MAIL_FAILED",Info_" Error="_$$ParseStatus^vhLib.System(stSendMail))
+
 	Quit stSendMail
 ]]></Implementation>
 </Method>