Index: csp/vhisie/TBX/Wizard/tmpDev.mac.rou
===================================================================
diff -u -r41 -r79
--- csp/vhisie/TBX/Wizard/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 41)
+++ csp/vhisie/TBX/Wizard/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 79)
@@ -61,7 +61,7 @@
 	Set UserType=$$ophGetUserType(KLNr,TBXContext.GeefWebDomein(),VERW,sMode)
 	Set %session.Data("UserType")=UserType
 	;Set UserTypeTxt=$CASE(UserType, $$$utKlantAnon:"KlantAnon", $$$utKlantKnown:"KlantKnown", $$$utVerwSub:"VerwSub", $$$utVerwDomain:"VerwDomain", $$$utVerwAdmin:"VerwAdmin", "":"?", :UserType)
-	If (wsID="")&&(KLNr>0) Do
+	If (wsID="")&&(TBXContext.IsKlantIDIngevuld(KLNr)) Do
 	. ; New from Order (Copy into New) : wsIDFrom is passed by QS-parameter 
 	. Set wsIDFrom=$G(%request.Data("NEWFROMORD",1))
 	. Set blnNewFromOrd=($$ophCheckFromWSOrd(wsIDFrom,KLNr))
@@ -70,15 +70,16 @@
 	. Set wsIDFrom=wsID
 	. Set blnNewFromOrd=0
 	
-#If $$$NSpace="DEMO" 
-	Set blnCalcPrices=0
-	New CalcExpr
-	Set CalcExpr=$G(^UI.Settings("WWW-TBX","DEMO","CalcPrijs","ExprCondit"),0)
-	If @CalcExpr Set blnCalcPrices=1
-	;Set:(%RemoteIP?1(1"192.168.1.195")) blnCalcPrices=1
-#Else
-	Set blnCalcPrices=(KLNr>0)||(UserType>$$$utKlantAnon)
-#EndIf
+	Set blnCalcPrices=(TBXContext.IsKlantIDIngevuld(KLNr))||(UserType>$$$utKlantAnon)
+	If 0 && (blnCalcPrices) && ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("Nog_in_te_vullen") {
+		// Op de DEMO-site mogen geen prijzen berekend worden.  Daarom blnCalcPrices=0
+		// Uitzonderingen (bvb. voor bepaalde IP-adressen) kunnen via een Global-expression ingevuld worden. 
+		Set blnCalcPrices=0
+		New CalcExpr
+		Set CalcExpr=$G(^UI.Settings("WWW-TBX","DEMO","CalcPrijs","ExprCondit"),0)
+		If @CalcExpr Set blnCalcPrices=1
+		;Set:(%RemoteIP?1(1"192.168.1.195")) blnCalcPrices=1
+	}
 	Set blnPriceAvail=(blnCalcPrices)||($$ophGetPriceAvail(wsID))
 	Set blnCalcOFFAV=(blnCalcPrices)&&($$ophGetBonType(wsID)="OFFAV")
 	Set Munt="EUR"
@@ -88,8 +89,8 @@
 	Set:(blnPriceAvail )||(sMode'="A") lbShowFT=lbShowFT_$LB("OFF")
 	Set:(TBXContext.IsDomeinHEIN())||(sMode'="A")||((wsID>0)&&(sMode'="A")) lbShowFT=lbShowFT_$LB("BBON")
 	Set BTWInputMode=$S($$$NSpace="DEMO":0, 'blnVHEPN:0, blnCalcPrices:1, 1:3)   ; 0=hidden, 1=shown but optional, 3=shown+obligatory
-	Set:(blnVHEPN)&&(KLNr>0) BTWInputMode=0   ; Overrules previous line 
-	Set blnShowDynSpace=(blnVHEPN)&&(KLNr?1(1"4645x",1"6821"))
+	Set:(blnVHEPN)&&(TBXContext.IsKlantIDIngevuld(KLNr)) BTWInputMode=0   ; Overrules previous line 
+	Set blnShowDynSpace=0   ; (blnVHEPN)&&(KLNr?1(1"4645x",1"6821"))
 	// Design Choice Mode : Intivo, Standaard of eXpert 
 	Set DCM=""
 	Set:(wsIDFrom>0) DCM=##class(WS.TBX.Order).DCMCalc(wsIDFrom)   ; wsID or wsIDFrom 
@@ -116,7 +117,7 @@
 	Quit 1
 ophGetUserType(KLNr,Domain,Verw,Mode)
 	  ;d WL^vhDBG("KLNr"_KLNr_"   Mode="_Mode_"   wsID="_wsID_"   Verw="_Verw_"   Domain="_Domain)
-	Quit:(Mode="A") $S(TBXContext.AlleenToegangZonderLogin():$$$utKlantAnonWP, KLNr>0:$$$utKlantKnown, 1:$$$utKlantAnon)
+	Quit:(Mode="A") $S(TBXContext.AlleenToegangZonderLogin():$$$utKlantAnonWP, TBXContext.IsKlantIDIngevuld(KLNr):$$$utKlantKnown, 1:$$$utKlantAnon)
 	Quit:(Mode="W") $$ophGetVERWType(Domain,Verw)
 	Quit:(Mode="P") $$$utKlantAnon                        ; Temporary: fixed value
 	;Else
@@ -131,7 +132,7 @@
 	Quit:('$IsObject(WSOrd)) 0
 	Set OrdDomVERW=$LG(##class(WS.TBX.Order).DomainLookUp($$TBXDomainCVT^cspBasis.Library(WSOrd.WebDomain),$LB("VERW")),1)
 	Quit:(OrdDomVERW'=TBXContext.GeefDomeinVerwerker()) 0   ; Onbekend of foutief domein
-	Quit (WSOrd.KLNummer>0)&&(WSOrd.KLNummer=MatchKLNr)
+	Quit (TBXContext.IsKlantIDIngevuld(WSOrd.KLNummer))&&(WSOrd.KLNummer=MatchKLNr)
 ophInschfElmntInfo(wsID)
 	// bepalen of InschuifElement reeds gekozen is kan adhv bestaand order.