Index: csp/vhisie/TBX/Wizard/tmpDev.mac.rou
===================================================================
diff -u -r1571 -r1626
--- csp/vhisie/TBX/Wizard/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 1571)
+++ csp/vhisie/TBX/Wizard/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 1626)
@@ -6,7 +6,6 @@
  */
  
 OnPreHTTP()
-#define TaalDfl   $S(blnHEIN:"D", blnLMC:"F", blnSFS:"D", 1:"N")
 	New name,tmpRq,RefArray,OutPage,Ref,luSafe,luTBX,lbDomLU
 	New blnSubmit,blnRedir,PSW,i
 	  s:('$D(%ClientIP)) %ClientIP="192.168.1.97"
@@ -22,11 +21,18 @@
 	Kill %session.Data("UserType")
 	Kill %session.Data("QSDATA")
 	//   URL --> domain / sDomVERW / sDomKLNr 
-	Set sDomain=$$GetURLDomain^cspBasis.Library
-	Set sDomCVT=$$TBXDomainCVT^cspBasis.Library(sDomain)
-	Set lbDomLU=##class(WS.TBX.Order).DomainLookUp(sDomCVT,$LB("VERW","KLNR"))   ; $$TBXDomainLU^cspBasis.Library(sDomCVT,$LB("VERW","KLNR"))
-	Set sDomVERW=$LG(lbDomLU,1)
-	Set sDomKLNr=$LG(lbDomLU,2)
+	;Set sDomain=$$GetURLDomain^cspBasis.Library
+	;Set sDomCVT=$$TBXDomainCVT^cspBasis.Library(sDomain)
+	;Set lbDomLU=##class(WS.TBX.Order).DomainLookUp(sDomCVT,$LB("VERW","KLNR"))   ; $$TBXDomainLU^cspBasis.Library(sDomCVT,$LB("VERW","KLNR"))
+	;Set sDomVERW=$LG(lbDomLU,1)
+	;Set sDomKLNr=$LG(lbDomLU,2)
+	Set TBXContext=##class(APPS.TBXWeb.TBXContext).InitFromHttpRequest()
+	Set sDomVERW=TBXContext.GeefDomeinVerwerker()
+	/***   volgende vars mogen weg na testen :   ***/
+	Set sDomain=TBXContext.GeefHttpRequestDomein()
+	Set sDomCVT=TBXContext.GeefWebDomein()
+	Set sDomKLNr=TBXContext.GeefDomeinKlantNummer()
+	
 	Set blnVHEPN=(sDomVERW="VHEPN")
 	Set blnHEIN=(sDomVERW="HEIN")
 	Set blnLMC=(sDomVERW="LMC")
@@ -36,8 +42,8 @@
 	Set blnSFS=(sDomVERW="SFS")
 	Set blnMBHO=(sDomVERW="MBHO")
 	Set blnHFLB=(sDomVERW="HFLB")
-	Set:('$D(%session.Data("BeursUser"))) %session.Data("BeursUser")=(blnVHEPN)&&##class(cspBasis.GAProdTBox).IsBeursUser()
-	Set %session.Data("DOMAIN")=sDomCVT
+	Set:('$D(%session.Data("BeursUser"))) %session.Data("BeursUser")=(TBXContext.IsDomeinVHEPN())&&##class(cspBasis.GAProdTBox).IsBeursUser()
+	Set %session.Data("DOMAIN")=TBXContext.GeefWebDomein()
 	Set %session.Data("URL")=%request.URL
 	Set %session.Data("REFMN")=$system.Encryption.Base64Decode($TR($G(%request.Data("REFMN",1)),"_-","+="))
 	Merge %session.Data("QSDATA")=%request.Data
@@ -46,13 +52,13 @@
 	Set KLNr=$$SesDataFromRq^cspBasis.Library("KLNR",,"")
 	Set wsID=$$SesDataFromRq^cspBasis.Library("WSID",,"")
 	Set sMode=$$SesDataFromRq^cspBasis.Library("MODE",,"")
-	Set Taal=$$SesDataFromRq^cspBasis.Library("Taal",,$$$TaalDfl)
+	Set Taal=$$SesDataFromRq^cspBasis.Library("Taal",,TBXContext.GeefDefaultTaal())
 	// Als toch niet correcte URL, dan redirect naar "Aanvraag Anonymous" 
 	If (sMode'?1(1"A",1"W",1"P")) Do  Quit 1
-	. Set %response.Redirect="/VHISIE/TBX/Access.csp?Taal="_Taal_"&REF="_$$CreateHashedRef^cspBasis.TBX.DecodeURL.tmpDev($LB(,sDomVERW,,"A"))   ; ServerSideRedirect
+	. Set %response.Redirect="/VHISIE/TBX/Access.csp?Taal="_Taal_"&REF="_$$CreateHashedRef^cspBasis.TBX.DecodeURL.tmpDev($LB(,TBXContext.GeefDomeinVerwerker(),,"A"))   ; ServerSideRedirect
 	// Else 
-    Set:($G(VERW)="") VERW=sDomVERW   ;d WL^vhDBG("VERW="_VERW_"   domain="_sDomCVT_"   sDomVERW="_sDomVERW)
-	Set UserType=$$ophGetUserType(KLNr,sDomCVT,VERW,sMode)
+    Set:($G(VERW)="") VERW=TBXContext.GeefDomeinVerwerker()   ;d WL^vhDBG("VERW="_VERW_"   domain="_TBXContext.GeefWebDomein()_"   sDomVERW="_TBXContext.GeefDomeinVerwerker())
+	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
@@ -76,11 +82,11 @@
 	Set blnPriceAvail=(blnCalcPrices)||($$ophGetPriceAvail(wsID))
 	Set blnCalcOFFAV=(blnCalcPrices)&&($$ophGetBonType(wsID)="OFFAV")
 	Set Munt="EUR"
-	Set Munt=$$GetUserMunt^cspBasis.Library(sDomVERW,)
+	Set Munt=$$GetUserMunt^cspBasis.Library(TBXContext.GeefDomeinVerwerker(),)
 	Set lbShowFT=""
 	Set:('blnCalcPrices)||(sMode'="A") lbShowFT=lbShowFT_$LB("OFFAV")
 	Set:(blnPriceAvail )||(sMode'="A") lbShowFT=lbShowFT_$LB("OFF")
-	Set:(blnHEIN)||(sMode'="A")||((wsID>0)&&(sMode'="A")) lbShowFT=lbShowFT_$LB("BBON")
+	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"))
@@ -89,32 +95,16 @@
 	Set:(wsIDFrom>0) DCM=##class(WS.TBX.Order).DCMCalc(wsIDFrom)   ; wsID or wsIDFrom 
 	Set:(DCM="") DCM=$G(%request.Data("DCM",1))
 	Set:(DCM="") DCM="S"   ; default 
-	Set lbDesignChoices=##class(cspBasis.GAProdTBox).GetDesignChoices(DCM,KLNr,sDomVERW,sDomKLNr)
+	Set lbDesignChoices=##class(cspBasis.GAProdTBox).GetDesignChoices(DCM,KLNr,TBXContext.GeefDomeinVerwerker(),TBXContext.GeefDomeinKlantNummer())
 	Set HeaderLogo = DCM
 	//Set:(DCM="I") HeaderLogo="I"
 	// Bulk Settings 
-	If (blnVHEPN)&&(KLNr>0) Do
-	. Set KLMiniWS=##class(cspBasis.GAProdTBox).GetKlantData(sDomVERW,KLNr)
-	. If KLMiniWS.BulkVPKCode'="" Do
-	. . Set lbBulkConfig=$LB(KLMiniWS.BulkVPKCode,KLMiniWS.BulkMinQty,"checked")
-	. Else  Do
-	. . Set lbBulkConfig=##class(cspBasis.GAProdTBox).GetKlantBulk(sDomVERW,KLNr)
-	.   ;d WL^vhDBG("lbBulkConfig: "_$$$LCVT(lbBulkConfig))
-	. Quit:(lbBulkConfig="")||($LG(lbBulkConfig,1)_$LG(lbBulkConfig,2)="")
-	. Set:($LG(lbBulkConfig,1)="") $LI(lbBulkConfig,1)="O"
-	. Set:($LG(lbBulkConfig,2)<1) $LI(lbBulkConfig,2)=20
-	Else  If blnLMC Do
-	. ;Set lbBulkConfig=$LB("O",20)
-	. Set lbBulkConfig=""   ; ##class(cspBasis.GAProdTBox).GetKlantBulk("VHEPN",sDomKLNr)
-	Else  If blnSFS||blnMBHO||blnHFLB Do
-	. Set lbBulkConfig=""
-	Else  Do
-	. Set lbBulkConfig=""
+	Set lbBulkConfig=TBXContext.GeefBulkConfigOpties(KLNr)
 	Set lbAllowVPK=$S($LG(lbBulkConfig,1)'?1(1"",1"S"):$LB("S")_$LB($LG(lbBulkConfig,1)), 1:"")   ; _$LB("O","C","A","B","P","X","Y","Z")   ; Indien alleen Stukverpakking, dan leeg,  anders $LB("S")_$LB(...) 
  
 	// BL voor Defaults 
 	Set blTBoxDfl=##class(cspBasis.GAProdDfls).Instantiate()
-	Do blTBoxDfl.Init(KLNr,sDomVERW,DCM,Taal,lbAllowVPK)
+	Do blTBoxDfl.Init(KLNr,TBXContext.GeefDomeinVerwerker(),DCM,Taal,lbAllowVPK)
 	Do blTBoxDfl.BuildMatenDefaultsJS()      ;Set sc=blTBoxDfl.ErrorStatus 
 	Do blTBoxDfl.BuildKleurDefaultsJS("*")   ;Set sc=blTBoxDfl.ErrorStatus 
 	Do:DCM="I" blTBoxDfl.BuildInschfElmntJS()
@@ -126,11 +116,7 @@
 	Quit 1
 ophGetUserType(KLNr,Domain,Verw,Mode)
 	  ;d WL^vhDBG("KLNr"_KLNr_"   Mode="_Mode_"   wsID="_wsID_"   Verw="_Verw_"   Domain="_Domain)
-#If $$$NSpace="xDEMO" 
-	Quit:(Mode="A") $S(1:$$$utKlantAnon)
-#Else
-	Quit:(Mode="A") $S(blnHEIN||blnDUPO||blnHELMY||blnHFLE:$$$utKlantAnonWP, KLNr>0:$$$utKlantKnown, 1:$$$utKlantAnon)   ; blnLMC,blnSFS : $$$utKlantKnown 
-#EndIf
+	Quit:(Mode="A") $S(TBXContext.AlleenToegangZonderLogin():$$$utKlantAnonWP, KLNr>0:$$$utKlantKnown, 1:$$$utKlantAnon)
 	Quit:(Mode="W") $$ophGetVERWType(Domain,Verw)
 	Quit:(Mode="P") $$$utKlantAnon                        ; Temporary: fixed value
 	;Else
@@ -144,7 +130,7 @@
 	Set WSOrd=##class(WS.TBX.Order).%OpenId(FromOrdID)
 	Quit:('$IsObject(WSOrd)) 0
 	Set OrdDomVERW=$LG(##class(WS.TBX.Order).DomainLookUp($$TBXDomainCVT^cspBasis.Library(WSOrd.WebDomain),$LB("VERW")),1)
-	Quit:(OrdDomVERW'=sDomVERW) 0   ; Onbekend of foutief domein
+	Quit:(OrdDomVERW'=TBXContext.GeefDomeinVerwerker()) 0   ; Onbekend of foutief domein
 	Quit (WSOrd.KLNummer>0)&&(WSOrd.KLNummer=MatchKLNr)
 ophInschfElmntInfo(wsID)
 	// bepalen of InschuifElement reeds gekozen is kan adhv bestaand order.
@@ -180,5 +166,5 @@
 	&SQL(SELECT BonType into :sBonType FROM WS_TBX.WebOrder WHERE ID=:wsID)
 	Quit sBonType
 ophAddToLog
-	Do ##class(cspBasis.GAProdTBox).AddToLog($S((sMode="A")&&(wsID'>0):$S($G(blnNewFromOrd):"WIZARD_COPY",1:"WIZARD_NEW"), 1:"WIZARD_OPEN"),sDomain,KLNr,sMode_$S(DCM'?1(1"S",1""):" - "_DCM,1:""),wsID,VERW,Taal,"")
+	Do ##class(cspBasis.GAProdTBox).AddToLog($S((sMode="A")&&(wsID'>0):$S($G(blnNewFromOrd):"WIZARD_COPY",1:"WIZARD_NEW"), 1:"WIZARD_OPEN"),TBXContext.GeefHttpRequestDomein(),KLNr,sMode_$S(DCM'?1(1"S",1""):" - "_DCM,1:""),wsID,VERW,Taal,"")
 	Quit
\ No newline at end of file