Index: csp/vhisie/TBX/Main/tmpDev.mac.rou
===================================================================
diff -u -r1410 -r1571
--- csp/vhisie/TBX/Main/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 1410)
+++ csp/vhisie/TBX/Main/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 1571)
@@ -11,10 +11,8 @@
OnPreHTTP()
#define CSPPage ##class(%CSP.Page)
-#define TaalDfl $S(blnHEIN:"D", blnLMC:"F", blnSFS:"D", 1:"N")
-#define VerwHasAccess (VERW="VHEPN")||('blnVHEPN&&(VERW=sDomVERW))
- New Ref,RefNew,RefArray,tmpRq,tmpTransfStatus,tmpBadQS,blnValidKlant
+ New Ref,RefNew,RefArray,tmpRq,tmpTransfStatus,tmpBadQS,blnValidKlant,DefaultTaal
Set %RemoteIP=$G(%request.CgiEnvs("REMOTE_ADDR"))
Set %ClientIP=%RemoteIP ; IP voor DebugWindow
@@ -25,15 +23,19 @@
Kill %session.Data
;d:($D(tmpTransfStatus)) WL^vhDBG("tmpTransfStatus: "_tmpTransfStatus)
Set:($D(tmpTransfStatus)) %session.Data("TransfStatus")=tmpTransfStatus
- // 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 TBXContext=##class(APPS.TBXWeb.XXXContext).InitFromHttpRequest()
+ Set sDomain=TBXContext.GeefHttpRequestDomein()
+ Set sDomCVT=TBXContext.GeefWebDomein()
+ Set sDomVERW=TBXContext.GeefDomeinVerwerker()
+ Set sDomKLNr=TBXContext.GeefDomeinKlantNummer()
+
Set Taal="E"
- Set blnNoAccess=(sDomVERW="") ; ONBEKEND DOMEIN - NIET TOEGELATEN !!!
+ Set DefaultTaal=TBXContext.GeefDefaultTaal()
+ ;Set blnNoAccess=(sDomVERW="") ; ONBEKEND DOMEIN - NIET TOEGELATEN !!!
+ Set blnNoAccess=TBXContext.IsOngeldigDomein() ; ONBEKEND DOMEIN - NIET TOEGELATEN !!!
Quit:(blnNoAccess) 1
+
Set blnVHEPN=(sDomVERW="VHEPN")
Set blnHEIN=(sDomVERW="HEIN")
Set blnLMC=(sDomVERW="LMC")
@@ -42,7 +44,8 @@
Set blnHFLE=(sDomVERW="HFLE")
Set blnSFS=(sDomVERW="SFS")
Set blnMBHO=(sDomVERW="MBHO")
- Set Taal=$G(%request.Data("Taal",1),$$$TaalDfl)
+ Set blnHFLB=(sDomVERW="HFLB")
+ Set Taal=$G(%request.Data("Taal",1),DefaultTaal)
If ($$$LCase(Taal)?1"http:".E) Do ; attempt to hack the website
. Set tmpBadQS="Taal="_Taal
. Set Taal="E"
@@ -53,7 +56,7 @@
;Set MainMode=$G(MainMode,$$$mmAllowTogether)
Set Ref=$G(%request.Data("REF",1))
Set RefNew=$G(%request.Data("REF",1),$$$RefStartNew) ; Als REF niet meegegeven is, StartNew (dfl) gebruiken
- Set %session.Data("BeursUser")=(blnVHEPN)&&##class(cspBasis.GAProdTBox).IsBeursUser()
+ Set %session.Data("BeursUser")=(TBXContext.IsDomeinVHEPN())&&##class(cspBasis.GAProdTBox).IsBeursUser()
If 1,($$$LCase(Ref)?1"http:".E) Do ; attempt to hack the website
. Set tmpBadQS="Ref="_Ref
@@ -68,12 +71,13 @@
;Set:(Ref="")&&($L(RefNew)) Ref=RefNew
If $L(Ref) Do
. Do ophRefToArray^cspBasis.TBX.DecodeURL.tmpDev(Ref,.RefArray)
- . Set:($G(RefArray("VERW"))="") RefArray("VERW")=sDomVERW
+ . Set:($G(RefArray("VERW"))="") RefArray("VERW")=TBXContext.GeefDomeinVerwerker()
. Set VERW=RefArray("VERW")
. Set KLNr=$G(RefArray("KLNR"))
. Set wsID=$G(RefArray("WSID"))
.
- . Quit:($$$Not(blnLMC||blnSFS||blnMBHO))
+ . Quit:($$$Not(TBXContext.KlantGegevensViaDataOpt())) ; :($$$Not(blnLMC||blnSFS||blnMBHO))
+ .
. ; Alleen voor OPTIMA / SFS --> KlantNr from Data/Storage
. If $L($G(KLNrOptima)) Do
. . Set KLNr=KLNrOptima
@@ -83,7 +87,7 @@
. . Kill tmpRq("DATAOPT")
. . ;Do ophBuildSwitchTLArray ; Once again, but with the NEW QueryString-values
. Else If ($IsValidNum(KLNr))&&($G(%request.Data("Taal",1))="") Do
- . . Set KLMini=##class(cspBasis.GAProdTBox).GetKlantData(sDomVERW,KLNr,$LB("Stg","NoAction"))
+ . . Set KLMini=##class(cspBasis.GAProdTBox).GetKlantData(TBXContext.GeefDomeinVerwerker(),KLNr,$LB("Stg","NoAction"))
. . Set:($IsObject(KLMini))&&(KLMini.Taal?1(1"N",1"F",1"E",1"D")) Taal=KLMini.Taal
. . Set KLMini=""
Else Do
@@ -102,7 +106,7 @@
. Set KLNr=$G(KLNr)
. Set sMode=$G(sMode,"START")
. Set wsID=$G(wsID)
- . Set VERW=$G(sDomVERW,sDomVERW)
+ . Set VERW=TBXContext.GeefDomeinVerwerker() ; $G(VERW,sDomVERW)
. Do ophAddToLog("!MAINPAGE!")
. Set msg="Invalid request URL parameter."_$$$CRLF_"Bad QueryString: "_tmpBadQS_$$$CRLF_"Ref="_$G(%request.Data("REF",1))_$$$CRLF_"Taal="_$G(%request.Data("Taal",1))_$$$CRLF_"!!! Page blocked - No access !!!"
. Do ophSendAlertMail(msg)
@@ -118,7 +122,7 @@
Do ophSendAlertMail(msg)
}
- Set:($G(VERW)="") VERW=sDomVERW
+ Set:($G(VERW)="") VERW=TBXContext.GeefDomeinVerwerker()
Kill arShow
; Analyse REF (part 2)
Set blnNoAccess=0
@@ -143,7 +147,7 @@
If $$$IsRecentBrowser(%request.UserAgent) Do ; Added by WimV on 28/03/2011
. Set %session.BrokerImplementation=2 ; use XMLHTTPRequest method
-
+
If 'blnAllowedBrowser Do
. Set blnNoAccess=1
. New sUserAgent
@@ -167,12 +171,11 @@
. Set NoAccessMsg=NoAccessMsg_$$$CRLF_" Please use ""Internet Explorer"", ""Firefox v3"" or ""Opera"" as web browser."
. Do ophAddToLog("!MAINPAGE!")
.
- .
- Else If (blnLMC||blnSFS||blnMBHO)&&($L($G(%request.Data("DATAOPT",1))))&&($G(KLNrOptima)="") Do ; Bad encryption for Optima/SFS customer
+ Else If (TBXContext.KlantGegevensViaDataOpt())&&($L($G(%request.Data("DATAOPT",1))))&&($G(KLNrOptima)="") Do ; Bad encryption for Optima/SFS customer
. Set blnNoAccess=1
. Do ophAddToLog("!MAINPAGE!")
Quit:(blnNoAccess) 1
- Set blnNoAccess=$$$Not($$$VerwHasAccess)
+ Set blnNoAccess=$$$Not(TBXContext.IsVerwerkerToegelaten(VERW))
Quit:(blnNoAccess) 1
Do ophAnalyseWSOrdKLNr(WSOrd,KLNr,.blnNoAccess,.NoAccessMsg) ; andere parameters globaal doorgeven
Set:($L($G(NoAccessMsg)))&&(sMode'="PROCESS") NoAccessMsg="" ; Enkel tonen indien sMode="PROCESS"
@@ -189,7 +192,7 @@
Do ##class(cspBasis.GAProdTBox).AddToLog(Actie,sDomain,KLNr,sMode,wsID,VERW,Taal,"",lbExtras) ; Actie="MAINPAGE"
Quit
ophWebSiteBlocked()
- If '$$AppIsEnabled^cspBasis.Library("WWW-TBX","MAIN"_$S(blnSFS:"-SFS",1:""),%RemoteIP) Do Quit 1
+ If '$$AppIsEnabled^cspBasis.Library("WWW-TBX","MAIN"_$S(TBXContext.IsDomeinSFS():"-SFS",1:""),%RemoteIP) Do Quit 1
. Set KLNr=$G(KLNr), sMode=$G(sMode), wsID=$G(wsID), VERW=$G(VERW)
. Do ophAddToLog("#MAINPAGE#")
. Do RedirectPage^cspBasis.Library("/Under_Construction.htm")
@@ -210,19 +213,20 @@
Set:($IsObject(WSLn))&&(##class(BL.PR.GA.TandemBox).DesignCodeFromDS(WSLn.ItemDS)="I") HeaderLogo="" ; "I"
Quit
ophDataOPTIMA
- Quit:(sDomVERW'?1(1"LMC",1"SFS",1"MBHO"))
+ Quit:('TBXContext.KlantGegevensViaDataOpt())
Quit:($G(%request.Data("DATAOPT",1))="")
;Quit:(sDomVERW'="LMC")||($G(%request.Data("DATAOPT",1))="")
- New KLMini,tmpTaal,msg
+ New KLMini,tmpTaal,msg,sDomVERW
Kill %OptimaMsg
- Set KLMini=##class(cspBasis.GAProdTBox).GetKlantData(sDomVERW,"",$LB("Ext","CleanSave"))
+ Set KLMini=##class(cspBasis.GAProdTBox).GetKlantData(TBXContext.GeefDomeinVerwerker(),"",$LB("Ext","CleanSave"))
; In case of "Bad Encryption", try getting KLData from storage
If '$IsObject(KLMini) Do
. Set KLNr=$G(%OptimaVar("KLNr"))
- . Set:($IsValidNum(KLNr)) KLMini=##class(cspBasis.GAProdTBox).GetKlantData(sDomVERW,KLNr,$LB("Stg","NoAction"))
+ . Set:($IsValidNum(KLNr)) KLMini=##class(cspBasis.GAProdTBox).GetKlantData(TBXContext.GeefDomeinVerwerker(),KLNr,$LB("Stg","NoAction"))
+ . Set sDomVERW=TBXContext.GeefDomeinVerwerker()
. Set msg="WARNING : Bad encryption for "_$S(sDomVERW="LMC":"Optima",1:sDomVERW)_" customer (n� "_$G(KLNr)_")"
. Set msg=msg_$$$CRLF_"Ref : "_($$ophGetRef^cspBasis.TBX.DecodeURL.tmpDev(Ref))_$$$CRLF_"Enc. Data : "_$G(%OptimaVar("EncData"))_$$$CRLF_"Decrypted Data : "_$G(%OptimaVar("Data"))_$$$CRLF_"KLNr via Lookup: "_$G(%OptimaVar("KLNrViaLookup"))
- . Set msg=msg_$$$CRLF_"Client IP : "_$G(%RemoteIP)_$S($G(%RemoteIP)?1(1"92.103.129.165",1"212.103.4.85"):" (Optima)", 1:"")
+ . Set msg=msg_$$$CRLF_"Client IP : "_$G(%RemoteIP)_$S(TBXContext.IsIPvanOptima($G(%RemoteIP)):" (Optima)", 1:"")
. Set msg=msg_$$$CRLF_$$$CRLF_"Data retrieved from storage: "_$S($IsObject(KLMini):"YES", 1:"NO")
. Do ophSendAlertMail(msg_$$$CRLF,$S($IsObject(KLMini):$LB("ICT_Meldingen@vanhoecke.be"), 1:$LB("wv@vanhoecke.be")))
. Set KLNr=$S($IsObject(KLMini):KLMini.Nummer, 1:"")
@@ -231,7 +235,7 @@
. Set KLNrOptima=KLMini.Nummer
. Set tmpTaal=KLMini.Taal
Else Do
- . Set blnShow=$$$OptimaAccess
+ . Set blnShow=TBXContext.HeeftToegangTotFixOptimaPage($G(%RemoteIP)) ; $$$OptimaAccess
. Do MShowFixOptima(blnShow)
Set:($G(tmpTaal)?1(1"N",1"F",1"E",1"D")) Taal=tmpTaal
Set KLMini=""
@@ -270,35 +274,35 @@
Set arValues("WSOrder","ID")=WSOrd.%Id()
Set arValues("WSOrder","IngaveTS")=WSOrd.IngaveTijdStip
Set arValues("REF","Domain")=sDomain
- Set arValues("REF","DomVERW")=sDomVERW_" ("_sDomKLNr_")"
+ Set arValues("REF","DomVERW")=TBXContext.GeefDomeinVerwerker()_" ("_TBXContext.GeefDomeinKlantNummer()_")"
Set arValues("REF","KLNr")=MatchKLNr
Set arValues("REF","WSID")=wsID
Set arValues("REF","MODE")=sMode
Set arValues("REF","VERW")=VERW
Set arValues("REF","RqData")=$G(%request.Data("REF",1))
Set arValues(1,"ClientIP")=$G(%RemoteIP)
Set arValues(1,"blnHist")=$G(blnHist)
- ;d WL^vhDBG($$$LCVT($LB(WSOrd.WebDomain,$$TBXDomainCVT^cspBasis.Library(WSOrd.WebDomain),OrdDomVERW,sDomVERW)))
- If sDomVERW'=OrdDomVERW Do Quit 0
+ ;d WL^vhDBG($$$LCVT($LB(WSOrd.WebDomain,$$TBXDomainCVT^cspBasis.Library(WSOrd.WebDomain),OrdDomVERW,TBXContext.GeefDomeinVerwerker())))
+ If TBXContext.GeefDomeinVerwerker()'=OrdDomVERW Do Quit 0
. // Onbekend of foutief domein - GEEN TOEGANG !!! WSOrder moet steeds binnen WebDomein blijven !!!
. Set arValues(0,"ERROR")="Onbekend of foutief domein"
; Else ; ==> sDomVERW=OrdDomVERW
Quit:(%RemoteIP?1(1"192.168.1.")1.3N)&&(MatchKLNr=1000) 1
Set OrdKLNr=WSOrd.KLNummer
Set blnOK=0
- If blnVHEPN Do Quit blnOK
+ If TBXContext.IsDomeinVHEPN() Do Quit blnOK
. If OrdKLNr>0 Do
. . Set blnOK=$S(MatchKLNr>0:(OrdKLNr=MatchKLNr),1:(sMode="PROCESS")&&(VERW="VHEPN"))
. Else Do ; OrdKLNr=""
. . Set blnOK=$S(MatchKLNr>0:((sMode="PROCESS")&&(VERW="VHEPN")), 1:1)
. Set arValues(0,"ERROR")="KlantNummers komen niet overeen."
- Else If blnLMC||blnSFS||blnMBHO Do Quit blnOK
+ Else If TBXContext.KlantGegevensViaDataOpt() Do Quit blnOK
. Set blnOK=(OrdKLNr=MatchKLNr)||(MatchKLNr="")
. Set arValues(0,"ERROR")="KlantNummers komen niet overeen."
- Else If blnHEIN Do Quit blnOK
+ Else If TBXContext.IsDomeinHEIN() Do Quit blnOK
. Set blnOK=(OrdKLNr=MatchKLNr)
. Set arValues(0,"ERROR")="KlantNummers komen niet overeen."
- Else If blnHELMY||blnHFLE||blnDUPO Do Quit blnOK
+ Else If TBXContext.AlleenToegangZonderLogin() Do Quit blnOK
. Set blnOK=(OrdKLNr=MatchKLNr)
. Set arValues(0,"ERROR")="KlantNummers komen niet overeen."
; Else
@@ -432,8 +436,8 @@
Do ophBuildToggleHistAndOrder()
Quit
MShowNotRegUser
- Set arShow("NotRegUserInfo","INFO")=((blnVHEPN)&&(KLNr=""))
- Set arShow("NotRegUserInfoOPTIMA","INFO")=((blnLMC||blnSFS||blnMBHO)&&(KLNr="")) ; &&('$D(%session.Data("DA TAOPT"))))
+ Set arShow("NotRegUserInfo","INFO")=(TBXContext.IsDomeinVHEPN())&&(KLNr="")
+ Set arShow("NotRegUserInfoOPTIMA","INFO")=(TBXContext.KlantGegevensViaDataOpt())&&(KLNr="") ; &&('$D(%session.Data("DA TAOPT"))))
Quit
ophMMComplete
New WSOrd,blnDynaplugERR
@@ -443,7 +447,7 @@
Set arShow("DisplayOrder","DTL")=$IsObject(WSOrd)
Do MShowKnownCustomer(1)
; Info BrutoPrijsHein / NotRegUserInfo
- Set arShow("BrutoPrijsHein","INFO")=(blnHEIN)
+ Set arShow("BrutoPrijsHein","INFO")=(TBXContext.IsDomeinHEIN())
Set blnDynaplug=($IsObject(WSOrd))&&(WSOrd.WebURL="DYNAPLUG IMPORT")
If blnDynaplug Do
@@ -469,7 +473,7 @@
; Button BookmarkPage
Do MShowBookmarkPage('$IsValidNum(KLNr),WSOrd)
; Button Show XML
- Do MShowExportXML((blnVHEPN)&&((KLNr=$$$TBoxWebKlantNrVHEPN)||(KLNr=$$$TBoxWebKlantNrHEIN)) )
+ Do MShowExportXML((TBXContext.IsBeschikbaarExportXML())&&((KLNr=$$$TBoxWebKlantNrVHEPN)||(KLNr=$$$TBoxWebKlantNrHEIN)) )
; Button Submit
Do MShowSubmit(1,WSOrd,blnOFFVervallen||blnDynaplugERR)
; Button Modify Order
@@ -510,7 +514,7 @@
ophMMProcess
New WSOrd,blnProcessVH,blnQuit,blnAllowBulk
- Set blnProcessVH=(blnVHEPN)||(VERW="VHEPN")
+ Set blnProcessVH=(TBXContext.IsDomeinVHEPN())||(VERW="VHEPN")
If blnProcessVH Do Quit:($G(blnQuit,0))
. Set blnQuit=$$ophMMProcessFlowVHEPN
;Else : prepare buttons/info
@@ -524,10 +528,10 @@
Do MShowVervaldagOFFText
; Positie van de tekst t.o.v. de buttons
Set TextPos="RIGHT" ; $S($IsObject(WSOrd)&&(WSOrd.IsSubmitted()):"LEFT", 1:"RIGHT")
- Set lbBulkConfig=##class(cspBasis.GAProdTBox).GetKlantBulk(sDomVERW,KLNr)
+ Set lbBulkConfig=##class(cspBasis.GAProdTBox).GetKlantBulk(TBXContext.GeefDomeinVerwerker(),KLNr)
Set blnAllowBulk=($LG(lbBulkConfig,1)'="")&&($LG(lbBulkConfig,1)'="S")
; Button SwitchToViewMode
- Do MShowSwitchToViewMode(('blnVHEPN)&& 1) ; &&(WSOrd.BonType="INKP")
+ Do MShowSwitchToViewMode(('TBXContext.IsDomeinVHEPN())&& 1) ; &&(WSOrd.BonType="INKP")
; Button PrintPage
Do MShowPrintPage(1) ;VERW="VHEPN")
; Button Show XML
@@ -539,7 +543,7 @@
; Button Process --> SubmitToVHEPN / SubmitToAdmin)
If blnProcessVH Do
. ; Button SubmitToAdmin
- . Do:(%RemoteIP?1"192.168.".E) MShowSubmitAdminVerw(blnVHEPN||(VERW="VHEPN"),WSOrd)
+ . Do:(%RemoteIP?1(1"192.168.".E,1"127.0.0.1")) MShowSubmitAdminVerw(TBXContext.IsDomeinVHEPN()||(VERW="VHEPN"),WSOrd)
. ; Button ChangeBulk
. Set arShow("ChangeBulk","BTN")=(%RemoteIP?1"192.168.".E)
. If arShow("ChangeBulk","BTN") Do
@@ -550,7 +554,7 @@
. ;. Set arShow("ChangeBulk","BTN")=1
Else Do
. ; Button SubmitToVHEPN
- . Do MShowSubmitToVHEPN(sDomVERW'?1(1"VHEPN",1"HEIN",1"LMC"),WSOrd) ; ,1"SFS"
+ . Do MShowSubmitToVHEPN(TBXContext.SubmitToVHviaCspPage(),WSOrd)
. ; URL voor overzichtslijst AANKOOP:
. ; - http://www.tandem-box.com/VHISIE/TBX/Main.csp?Taal=N&HIST=1&REF=qF8LH5lEjVrpq_S/iFYEjapyttl87p0Y2mRRqi9B3i4-
. ; - http://tbx.destil.nl/VHISIE/TBX/Main.csp?Taal=N&HIST=1&REF=_KoQNXLGoSL1UjEAean5dapyttl87p0Y2mRRqi9B3i4-
@@ -588,7 +592,7 @@
. .
.
. Do ophOrdToAdminSetSesData
- . Set OFFToAdmin=$S(sDomVERW?1(1"VHEPN",1"HEIN",1"LMC"):"BBON", 1:"INKP") ; Set:(WSOrd.BonType="OFF") ...
+ . Set OFFToAdmin=$S('TBXContext.StatusInkoopAlsOrderToVH():"BBON", 1:"INKP") ; Set:(WSOrd.BonType="OFF") ...
. Set blnBusy=##class(WS.TBX.Order).TransfStatusCheckBusy(wsID)
. If (blnBusy) Do Quit ; ($G(%session.Data("TransfStatus"))'="")
. . ;d WL^vhDBG("Msg: transfert not allowed. status="_$G(%session.Data("TransfStatus")))
@@ -621,7 +625,7 @@
Quit:('$IsObject(WSOrd))
; Show Order Details
Set arShow("DisplayOrder","DTL")=$IsObject(WSOrd)
- Set arShow("BrutoPrijsHein","INFO")=(blnHEIN)
+ Set arShow("BrutoPrijsHein","INFO")=(TBXContext.IsDomeinHEIN())
Do MShowVervaldagOFFText
; Button PrintPage
Do MShowPrintPage(1)
@@ -640,39 +644,37 @@
Set sMode=$LG(lbRefNew,4,$G(tmpRefAr("MODE")))
Merge tmpRq=%request.Data
Kill tmpRq("CSPToken")
- Kill:(blnLMC||blnSFS||blnMBHO) tmpRq("DATAOPT")
+ Kill:(TBXContext.KlantGegevensViaDataOpt()) tmpRq("DATAOPT")
Kill tmpRq("HIST")
Kill tmpRq("REF")
Set tmpRq("REF")=$$CreateHashedRef^cspBasis.TBX.DecodeURL.tmpDev($LB(KLNr,VERW,wsID,sMode))
Set QS=##class(cspBasis.GAProdTBox).CQueryString(.tmpRq) ; $$$CSPPage.Link("Main.csp",.tmpRq)
Quit $TR($TR($system.Encryption.Base64Encode(QS),$$$CRLF,""),"+=","_-")
ophAlgVoorw
- Quit:(blnLMC||blnDUPO||blnHELMY||blnHFLE||blnMBHO)
+ Quit:('TBXContext.ToonAlgemeneVoorwaarden())
New Intern,VTL
- Set Intern="AlgVoorw"_$CASE(sDomVERW, "HEIN":"HEIN", "SFS":"SFS", :"VH")
+ Set Intern="AlgVoorw"_$CASE(TBXContext.GeefDomeinVerwerker(), "HEIN":"HEIN", "SFS":"SFS", :"VH")
Set arShow("AlgVoorw","INFO")=##class(cspBasis.GAProdTBox).WebTextValue(Intern,Taal,"L")
Quit
ophOrdToAdminSetSesData
- Set %session.Data("DOMAIN")=sDomCVT
+ Set %session.Data("DOMAIN")=sDomCVT ; TBXContext.GeefWebDomein()
Set %session.Data("VERW")=VERW
Set %session.Data("KLNR")=KLNr
Set %session.Data("WSID")=wsID
Set %session.Data("MODE")=sMode
Quit
MShowNewOrder(Visible)
- Quit:((blnLMC)&&(KLNr'>0))
- Quit:((blnSFS)&&(KLNr'>0))
- Quit:((blnMBHO)&&(KLNr'>0))
- Quit:(KLNr=$$$KLNrListAll)&&($$$Not((sDomVERW?1(1"HFLE",1"HELMY",1"DUPO"))&&(sMode="START")))
+ Quit:((TBXContext.AlleenToegangMetLogin())&&(KLNr'>0))
+ Quit:(KLNr=$$$KLNrListAll)&&($$$Not((sMode="START")&&(TBXContext.AlleenToegangZonderLogin())))
Quit:('$G(blnValidKlant,1))
New tmpAr
Merge tmpAr=tmpRq
Kill tmpAr("HIST")
Kill tmpAr("REF")
Set tmpAr("REF")=$$CreateHashedRef^cspBasis.TBX.DecodeURL.tmpDev($LB($S(KLNr=$$$KLNrListAll:"", 1:KLNr),VERW,,"A"))
Set tmpAr("REFMN")=$$ophBuildQS($S(KLNr=$$$KLNrListAll:$LB(""),1:$LB())_$LB(,,"COMPLETE")) ; Create REFMN (to pass to Wizard.csp)
- Kill:(blnLMC||blnSFS||blnMBHO) tmpAr("DATAOPT")
+ Kill:(TBXContext.KlantGegevensViaDataOpt()) tmpAr("DATAOPT")
Set arShow("NewOrder","BTN")=Visible
;d WL^vhDBG("NewOrder tmpAr:"_$$$ArrayTT("tmpAr"))
Set arShow("NewOrder","HREF")="Access.csp?"_##class(cspBasis.GAProdTBox).CQueryString(.tmpAr)
@@ -711,7 +713,7 @@
Kill tmpAr("HIST")
Kill tmpAr("REF")
Set tmpAr("REF")=$$CreateHashedRef^cspBasis.TBX.DecodeURL.tmpDev($LB(KLNr,VERW,wsID,"P"))
- Set blnShowAKP=(sMode="PROCESS")&&('blnVHEPN)&&(VERW'?1(1"HEIN",1"LMC"))
+ Set blnShowAKP=(sMode="PROCESS")&&('TBXContext.IsDomeinVHEPN())&&(VERW'?1(1"HEIN",1"LMC"))
Set %session.Data("ALLOWAKP")=blnShowAKP
Set:(blnShowAKP) tmpAr("SHAKP")=1
If $L($G(Taal)) Do
@@ -745,7 +747,7 @@
Set tmpAr("Taal")=Taal
Set tmpAr("KLNR")=KLNr
Set tmpAr("WSID")=wsID
- Set:(WSOrd.BonType="OFF")&&(sDomVERW'="HEIN") tmpAr("OFFTOBBON")=1 ; OFFTOBBON in de betekenis van "Goed voor order"
+ Set:(WSOrd.BonType="OFF")&&('TBXContext.VerzendOfferteAlsAanvraag()) tmpAr("OFFTOBBON")=1 ; OFFTOBBON in de betekenis van "Goed voor order"
Set %session.Data("Taal")=Taal
Set %session.Data("WSID")=wsID
Set %session.Data("KLNR")=KLNr
@@ -756,8 +758,8 @@
Set arShow("SubmitAgain","BTN")=(Visible)&&(blnIsSubmitted)
Quit:('Visible)
Set arShow("Submit","HREF")="MailSend.csp?"_##class(cspBasis.GAProdTBox).CQueryString(.tmpAr)
- Set InternText=$S((WSOrd.BonType="OFF")&&(sDomVERW'="HEIN"):"VerzendenBBON", 1:"Verzenden"_WSOrd.BonType)
- Set InternInfo=$S((WSOrd.BonType="OFF")&&(sDomVERW'="HEIN"):"VerzendInfoBBON", 1:"VerzendInfo"_WSOrd.BonType)
+ Set InternText=$S((WSOrd.BonType="OFF")&&('TBXContext.VerzendOfferteAlsAanvraag()):"VerzendenBBON", 1:"Verzenden"_WSOrd.BonType)
+ Set InternInfo=$S((WSOrd.BonType="OFF")&&('TBXContext.VerzendOfferteAlsAanvraag()):"VerzendInfoBBON", 1:"VerzendInfo"_WSOrd.BonType)
Set arShow("Submit","TEXT")=##class(cspBasis.GAProdTBox).WebTextValue(InternText,Taal,"L")
Set arShow("Submit","INFO")=##class(cspBasis.GAProdTBox).WebTextValue(InternInfo,Taal,"L")
Set:(arShow("Submit","INFO")="~") arShow("Submit","INFO")=""
@@ -804,10 +806,7 @@
Set arShow("ModifyOrder","HREF")="Access.csp?"_##class(cspBasis.GAProdTBox).CQueryString(.tmpAr)
Quit
MShowNewFromOrder(Visible)
-
- s blnShow=$$$Not(blnHEIN||blnDUPO||blnHELMY||blnHFLE) ; (sDomVERW="SFS")||((sDomVERW="VHEPN")&&(KLNr?1(1"12486",1"4645")))
- q:('blnShow) ; until completed and released to ALL
-
+ Quit:('TBXContext.ToonKnopDupliceerEnWijzig())
Quit:('$G(blnValidKlant,1))
Quit:('$IsObject(WSOrd))
New tmpAr
@@ -837,7 +836,7 @@
Set tmpAr("KLNR")=KLNr
Set tmpAr("WSID")=wsID
Set tmpAr("MODE")=sMode
- Set:(WSOrd.BonType="OFF")&&(sDomVERW'="HEIN") tmpAr("OFFTOBBON")=1 ; OFFTOBBON in de betekenis van "Goed voor order"
+ Set:(WSOrd.BonType="OFF")&&('TBXContext.VerzendOfferteAlsAanvraag()) tmpAr("OFFTOBBON")=1 ; OFFTOBBON in de betekenis van "Goed voor order"
Set %session.Data("Taal")=Taal
Set %session.Data("WSID")=wsID
Set %session.Data("KLNR")=KLNr
@@ -872,7 +871,7 @@
If ($L(lbLog))&&($LG(lbLog,2)>0) Do
. Set tmpAr("TRANSF")="AGAIN;ADM"
. Set arShow("SubmitAdminAgain","HREF")="main.csp?"_##class(cspBasis.GAProdTBox).CQueryString(.tmpAr)
- . Set arShow("SubmitAdminAgain","INFO")="offerte: "_$LG(lbLog,2)_" "_$$mssSubmitAdminTime($LG(lbLog,1))_" +++klantnr "_$S(blnVHEPN:KLNr, 1:sDomKLNr)_"+++"
+ . Set arShow("SubmitAdminAgain","INFO")="offerte: "_$LG(lbLog,2)_" "_$$mssSubmitAdminTime($LG(lbLog,1))_" +++klantnr "_$S(TBXContext.IsDomeinVHEPN():KLNr, 1:TBXContext.GeefDomeinKlantNummer())_"+++"
. Set arShow("SubmitAdminAgain","INFO")=$$$Replace(arShow("SubmitAdminAgain","INFO")," "," ")
Else Do
. Set arShow("SubmitAdminAgain","INFO")=""
@@ -904,9 +903,9 @@
MShowKnownCustomer(Visible)
#define KLNrClean $S(KLNr=$$$KLNrListAll:"", 1:KLNr)
New KLNaam,KLMini
- If (blnVHEPN)||(blnLMC)||(blnSFS)||(blnMBHO) Do
+ If TBXContext.HeeftToegangMetLogin() Do
. Quit:($$$KLNrClean="")
- . Set KLMini=##class(cspBasis.GAProdTBox).GetKlantData(sDomVERW,KLNr)
+ . Set KLMini=##class(cspBasis.GAProdTBox).GetKlantData(TBXContext.GeefDomeinVerwerker(),KLNr)
. ; If KLMini Do
. ;. Set KLNaam=KLMini.Naam
. Set:(KLMini) KLNaam=KLMini.Naam
@@ -963,14 +962,15 @@
#define pg ##class(cspBasis.GAProdTBox)
Kill arWSVTL
Quit:('$IsObject($G(WSOrd)))
- New i,WSLn,SomAKPrijs,BonType,Munt,MuntCalc
+ New i,WSLn,SomAKPrijs,BonType,Munt,MuntCalc,blnIsBeursUser
Set Munt="EUR"
- Set Munt=$$GetUserMunt^cspBasis.Library(sDomVERW,$G(VERW)) ; if sMode=PROCESS, then enable switch between EUR and CHF, by setting VERW="SFS" or VERW="VHEPN"
+ Set Munt=TBXContext.GeefUserMuntEenheid($G(VERW)) ; $$GetUserMunt^cspBasis.Library(TBXContext.GeefDomeinVerwerker(),$G(VERW)) ; if sMode=PROCESS, then enable switch between EUR and CHF, by setting VERW="SFS" or VERW="VHEPN"
+ Set blnIsBeursUser=(''$G(%session.Data("BeursUser")))
Set BonType=$$$pg.ConvertBonType(WSOrd.BonType,VERW,sMode)
Set arWSVTL("BonType")=$S($L(BonType):$$$pg.WebTextValue("FT_"_BonType,Taal,"L",$LB("U")), 1:"")
Set arWSVTL("NietMee")=$$pwoTransNietMee(WSOrd.NietMeeleveren) ; $S($L(WSOrd.NietMeeleveren):"corpusprofielen, afdekkappen", 1:"") ; "De corpusprofielen / afdekkappen worden niet meegeleverd.", 1:"")
- Set blnShowAKPrijs=(sMode="PROCESS")&&('blnVHEPN) ; &&(BonType="INKP")
- If sDomVERW="SFS" Do
+ Set blnShowAKPrijs=(sMode="PROCESS")&&('TBXContext.IsDomeinVHEPN()) ; &&(BonType="INKP")
+ If TBXContext.GeefDomeinVerwerker()="SFS" Do
. ; Aankoopprijzen in EUR berekend en getoond
. ; Verkoopprijzen in CHF berekend en getoond
. ; ==> m.a.w. Munt moet correct ingevuld worden (EUR of CHF); prijzen van WSOrd niet meer omrekenen, dus MuntCalc="EUR"
@@ -1010,15 +1010,15 @@
. . Set arWSVTL("LN",i,Key)=$$pwoTransItemValue($zobjproperty(WSLn,"Item"_Key),Key)
. Set arWSVTL("LN",i,"DIV")=$$pwoTransItemValue(WSLn.ItemDIVToLB(),"DIV") ; ..ItemDIVToLB() ; Returns $LB()
. Set arWSVTL("LN",i,"AANT")=$$pwoTransItemValue(WSLn.Qty,"AANT") ; _$$pwoTransItemValue(WSLn.ItemVPK,"VPK")
- . Set arWSVTL("LN",i,"PRIJS")=$$pwoTransItemValue($S($G(%session.Data("BeursUser")):99.99, blnShowAKPrijs:WSLn.AKPrijs, 1:WSLn.KostPrijs),"PRIJS")
+ . Set arWSVTL("LN",i,"PRIJS")=$$pwoTransItemValue($S(blnIsBeursUser:99.99, blnShowAKPrijs:WSLn.AKPrijs, 1:WSLn.KostPrijs),"PRIJS")
. Set blnContainsGlas=(blnContainsGlas)||(WSLn.ItemBX?1(1"BG",1"COV"))||(WSLn.ItemBGRP?1(1"V"))
. Set:(WSLn.KostPrijs["ERROR") blnWSErrors=1
. Set:(blnShowAKPrijs) SomAKPrijs=SomAKPrijs+(WSLn.AKPrijs*WSLn.Qty)
If 'blnContainsGlas Set arWSVTL("KLR_KV")=""
;Set:(blnShowAKPrijs) arWSVTL("AKPrijsTot")=$S($G(%session.Data("BeursUser")):99.99, 1:SomAKPrijs)
;Set arWSVTL("TotPrijs")=$$pwoTransTotPrijs($S($G(%session.Data("BeursUser")):99.99, blnShowAKPrijs:arWSVTL("AKPrijsTot"),1:WSOrd.TotPrijs))
- If $G(%session.Data("BeursUser")) Do
+ If blnIsBeursUser Do
. Set:(blnShowAKPrijs) arWSVTL("AKPrijsTot")=99.99
. Set arWSVTL("TotPrijs")=$$pwoTransTotPrijs(99.99)
Else Do
@@ -1060,39 +1060,15 @@
. Set:($L(NietMeeKey)) str=str_$S($L(str):", ", 1:"")_$$$pg.WebTextValue(NietMeeKey,Taal,"L",$$$LowerCaseExceptBS)
Quit str
-
- /*
- VORIGE VERSIE:
- ====== =======
- * /
- #If ($ZCVT($ZUTIL(110),"U")="WWW01")&&($$$NSpace'="DEMO")
- Set ClientHostIP=$S((VERW="VHEPN")&&('blnVHEPN):"192.168.1x.", 1:"192.168.1.")
- #Else
- Set ClientHostIP="192.168.1x."
- #EndIf
-
- &SQL(DECLARE crsHist CURSOR FOR
- SELECT Top 1000 KLNummer, KLNaam, BonType, ID, IngaveTijdStip, TotAantal Qty, TotPrijs Prijs, Commissie, SubmitTS
- INTO :tmpAr("KLNr"), :tmpAr("KLNaam"), :tmpAr("BonType"), :tmpAr("wsID"), :tmpAr("OrdTime"), :tmpAr("TotQty"), :tmpAr("TotPrs"), :tmpAr("Commissie"), :tmpAr("SubmitTS")
- FROM WS_TBX.WebOrder OrdHfd
- WHERE (WebDomain=:sDomain2) AND ((KLNummer=:KLNrSel)OR(:blnListALL=1)) AND (IngaveTijdStip > '2004-01-24') AND ID in
- (
- SELECT DISTINCT (LogT.WSOrderID)
- FROM DW_WWW.SysLogTBX LogT
- WHERE (LogT.Actie ='WIZARD_CALC') AND (NOT LogT.ClientHost %STARTSWITH :ClientHostIP)
- )
- ORDER BY IngaveTijdStip DESC, ID
- )
- /* */
PrepareHistVTL
#define KLNrClean $S(KLNr=$$$KLNrListAll:"", 1:KLNr)
;s:('$D(ClientIP)) ClientIP="192.168.1.97"
- New tmpAr,KLNrSel,i,wsID,Ref,WizMode,sDomain2,tmpKLNr,blnListALL,tmpNaam,BonType,Munt,ClientHostIP,MinShowH,MaxShowH,blnListHidden,blnListHiddenOnly,KLNrIsTestKlant
+ New tmpAr,KLNrSel,i,wsID,Ref,WizMode,sDomain2,tmpKLNr,blnListALL,tmpNaam,BonType,Munt,ClientHostIP,MinShowH,MaxShowH,blnListHidden,blnListHiddenOnly,KLNrIsTestKlant,blnIsBeursUser
Kill arHistVTL
Set KLNrIsTestKlant=0
- If (sDomVERW="VHEPN") && ( (KLNr?1(1"4682",1"1000",1"4645"))||($$$ValIsBetween(KLNr,15827,15836)) ) { Set KLNrIsTestKlant=1 }
+ If (TBXContext.IsDomeinVHEPN()) && ( (KLNr?1(1"4682",1"1000",1"4645"))||($$$ValIsBetween(KLNr,15827,15836)) ) { Set KLNrIsTestKlant=1 }
Set blnListHidden=($G(%request.Data("SHOWALL",1))="1")
If (##class(TECH.Config.ConfigMgr).Instance().GetBoolean("csp.vhisie.TBX.Main_ToonHistoriekVoorTestklanten"))
@@ -1101,11 +1077,12 @@
}
Set blnListHiddenOnly=0
Set blnListALL=(KLNr=$$$KLNrListAll)
+ Set blnIsBeursUser=(''$G(%session.Data("BeursUser")))
Set KLNrSel=$$$KLNrClean ; $S(KLNr=$$$KLNrListAll:"", 1:KLNr)
Set WizMode=$S(sMode?1(1"VIEW",1"PROCESS",1"COMPLETE"):sMode, 1:"COMPLETE")
Set sDomain2=$$TBXDomainCVT^cspBasis.Library(sDomain)
Set Munt="EUR"
- Set Munt=$$GetUserMunt^cspBasis.Library(sDomVERW,)
+ Set Munt=TBXContext.GeefUserMuntEenheid()
Do phvBuildColHeader
Set MinShowH=$$$shShownForKlant
@@ -1117,7 +1094,7 @@
. Set MinShowH=$S(VERW'="VHEPN":$$$shShownForVERW, 1:$$$shShownForVHEPN)
Else If KLNrIsTestKlant Do
. Set MinShowH=$$$shShownForVHEPN
- Else If 0 && ($G(%RemoteIP)?1(1"192.168.1.")) Do
+ Else If 0 && ($G(%RemoteIP)?1(1"192.168.1.",1"192.168.2.")) Do
. Set MinShowH=$$$shShownForVHEPN
&SQL(DECLARE crsHist CURSOR FOR
@@ -1156,15 +1133,15 @@
Quit
phvBuildHistArray
Set i=i+1
- Set:($G(%session.Data("BeursUser")))&&(tmpAr("TotPrs")) tmpAr("TotPrs")=99.99
+ Set:(blnIsBeursUser)&&(tmpAr("TotPrs")) tmpAr("TotPrs")=99.99
Merge arHistVTL("LN",i)=tmpAr
Set wsID=$G(tmpAr("wsID"))
Set tmpKLNr=$S(KLNr=$$$KLNrListAll:$G(tmpAr("KLNr")), 1:KLNr)
Set arHistVTL("LN",i,"KLNr")=$G(tmpAr("KLNr"))
Set arHistVTL("LN",i,"KLNaam")=$G(tmpAr("KLNaam"))
Set arHistVTL("LN",i,"Munt")=$S($G(tmpAr("Munt"))="":"EUR", 1:tmpAr("Munt"))
Set arHistVTL("LN",i,"MuntCalc")=arHistVTL("LN",i,"Munt")
- If sDomVERW="SFS" Do
+ If TBXContext.IsDomeinSFS() Do
. Set arHistVTL("LN",i,"Munt")="CHF"
. Set arHistVTL("LN",i,"MuntCalc")="EUR"
/*
@@ -1186,6 +1163,6 @@
Quit
phvManageBonType
Set BonType=$$$pg.ConvertBonType(arHistVTL("LN",i,"BonType"),VERW,WizMode)
- Set:(blnLMC||blnSFS||blnMBHO) arHistVTL("LN",i,"BonType")=BonType
+ Set:(TBXContext.KlantGegevensViaDataOpt()) arHistVTL("LN",i,"BonType")=BonType
Set arHistVTL("LN",i,"BonTypeVTL")=$$$pg.WebTextValue("FT_"_BonType,Taal,"L")
Quit
\ No newline at end of file