Index: cspBasis/Library.mac.rou =================================================================== diff -u -r120 -r135 --- cspBasis/Library.mac.rou (.../Library.mac.rou) (revision 120) +++ cspBasis/Library.mac.rou (.../Library.mac.rou) (revision 135) @@ -111,6 +111,7 @@ Quit:(Domain="localdev.sfsunimarket.biz" ) "tbx.sfsunimarket.biz" Quit:(Domain="localdev-tandembox.meubelbeslagholland.nl") $$$TBoxWebDomeinMBHO Quit:(Domain="localdev-tandembox.hafele.be" ) $$$TBoxWebDomeinHFLB + Quit:(Domain="localdev-tandembox.kisch.nl" ) $$$TBoxWebDomeinKISCH Quit:(Domain="demo.tandem-box.com" ) "demo.tandem-box.com" Quit:(Domain="demo.sfsunimarket.biz" ) "demo.sfsunimarket.biz" Index: BL/PR/GA/TB/tmpDev2.mac.rou =================================================================== diff -u -r58 -r135 --- BL/PR/GA/TB/tmpDev2.mac.rou (.../tmpDev2.mac.rou) (revision 58) +++ BL/PR/GA/TB/tmpDev2.mac.rou (.../tmpDev2.mac.rou) (revision 135) @@ -345,6 +345,8 @@ #define MargeHFLE 1 // MargeMBHO=1 , berekening via LijstPrijs --> geen #define MargeMBHO 1 + // MargeKISCH=1 , berekening via LijstPrijs --> geen +#define MargeKISCH 1 // MargeSFS= ? , berekening via ??? (modified by WimV on 28/02/2011, previous value: 2.8 --> change to MargeSFS active from 01/03/2011) #define MargeSFS 2.33 New KPrijsVH,LPrs,VKPrs,VerwMarge,KLNrPrs,PrPiece,GenPRNr,IsBeursUser,IsAnonymousUser @@ -437,13 +439,13 @@ // BENELUX handels met korting, i.e. met klantinfo New HandelVKPrijs,KPrijsData,HandelVKPrijs - If (sDomVERW="MBHO")||(sDomVERW="HFLB" ) { + If (sDomVERW="MBHO")||(sDomVERW="HFLB")||(sDomVERW="KISCH") { Set KPrijsData=$$KLANTPR^KPRIJS(KLNrPrs,GenPRNr,$G(%NoSa),$J(KPrijsVH,0,2)) Set HandelVKPrijs=$J($$$HandelLijstPrijs(KPrijsData)*KLReductie,0,2) // Als de "HandelVKPrijs met KLKorting" kleiner dan de HandelAKPrijs, dan wordt de KLKorting volledig ongedaan gemaakt. If HandelVKPrijs<$$$HandelAankoopPrijs(KPrijsData) { Set HandelVKPrijs=$$$HandelLijstPrijs(KPrijsData) } } - Quit:(sDomVERW="MBHO")||(sDomVERW="HFLB" ) HandelVKPrijs + Quit:(sDomVERW="MBHO")||(sDomVERW="HFLB")||(sDomVERW="KISCH") HandelVKPrijs // Niet-BENELUX handels (met en zonder korting , i.e. met en zonder klantinfo) Set VerwMarge=$CASE(sDomVERW, "HEIN":$$$MargeHEIN, "LMC":$$$MargeLMC, "SFS":$$$MargeSFS, :1) ; , "DUPO":$$$MargeDUPO, "HELMY":$$$MargeHELMY, "HFLE":$$$MargeHFLE, "MBHO":$$$MargeMBHO Index: APPS/TBXWeb/DomeinNamen.inc.rou =================================================================== diff -u -r18 -r135 --- APPS/TBXWeb/DomeinNamen.inc.rou (.../DomeinNamen.inc.rou) (revision 18) +++ APPS/TBXWeb/DomeinNamen.inc.rou (.../DomeinNamen.inc.rou) (revision 135) @@ -24,6 +24,7 @@ #define TBoxWebDomeinSFS "tbx.sfsunimarket.biz" #define TBoxWebDomeinMBHO "tandembox.meubelbeslagholland.nl" #define TBoxWebDomeinHFLB "tandembox.hafele.be" + #define TBoxWebDomeinKISCH "tandembox.kisch.nl" #define TBoxWebDomeinDEMO "demo.tandem-box.com" ; === Bijhorende Klantnummers === @@ -38,15 +39,18 @@ #define TBoxWebKlantNrMBHO "2999" #define TBoxWebKlantNrHFLB "4875" #define TBoxWebKlantNrVHEPNDEMO "6819" + #define TBoxWebKlantNrKISCH "2254" ; === Info pagina's voor de TBoxWeb handels === #define HomePageVHEPN "http://www.vanhoecke.be" #define TBoxInfoPageVHEPN "http://www.vanhoecke.be/nl/producten/tandem-box/" #define HomePageMBHO "http://www.meubelbeslagholland.nl" - ; #define TBoxInfoPageMBHO "http://www.meubelbeslagholland.nl/servodrive" #define TBoxInfoPageMBHO "" #define HomePageHFLB "http://www.hafele.be" - #define TBoxInfoPageHFLB "" \ No newline at end of file + #define TBoxInfoPageHFLB "" + + #define HomePageKISCH "http://www.kisch.nl" + #define TBoxInfoPageKISCH "" \ No newline at end of file Index: DW/WWW/HTTPLogTBXKisch.cls.xml =================================================================== diff -u --- DW/WWW/HTTPLogTBXKisch.cls.xml (revision 0) +++ DW/WWW/HTTPLogTBXKisch.cls.xml (revision 135) @@ -0,0 +1,102 @@ + + + + +Logging van www.destil.nl +persistent +1 +%Persistent +0 + + + +Number of bytes received +%Integer + + + + +Number of bytes sent +%Integer + + + + +Date and tmie that the log entry was created +%TimeStamp + + + + +Server name +%String + + + + +Type of the operation or command. For example, this may be USER for FTP or GET for WWW +%String + + + + +Any parameters for the operation. This can be either name/value pairs for invoking CGI or an ISAPI extension. It is a user name for the FTP command USER. +%String + + + + + +Time spent on request processing (in milliseconds) +%Integer + + + + +Server IP address +%String + + + + +Name of the service. This can be WWW, FTP or some other name +%String + + + + +Service status, such as 200 +%Integer + + + + +Target of the operation or command. For example, this may be Default.htm +%String + + + + +User name for the client. Mostly anonymous +%String + + + + +Windows NT status code. 0 typically indicates success +%Integer + + + + +Client ip address +%String + + + + +Reeds verwerkt flag (leeg of 1) +%Integer + + + Index: WV GAProduct DMZ.prj.xml =================================================================== diff -u -r124 -r135 --- WV GAProduct DMZ.prj.xml (.../WV GAProduct DMZ.prj.xml) (revision 124) +++ WV GAProduct DMZ.prj.xml (.../WV GAProduct DMZ.prj.xml) (revision 135) @@ -1,6 +1,6 @@ - + @@ -48,6 +48,7 @@ + @@ -80,6 +81,7 @@ + Index: APPS/TBXWeb/impl/KISCHOrderHandler.cls.xml =================================================================== diff -u --- APPS/TBXWeb/impl/KISCHOrderHandler.cls.xml (revision 0) +++ APPS/TBXWeb/impl/KISCHOrderHandler.cls.xml (revision 135) @@ -0,0 +1,62 @@ + + + +1 +AbstractOrderHandler +0 + + +0 + + + +%String + + + + +Boolean + + + + +Destination +%List +" + Set ServerPrefix="" +#Else + Set lbTo=$LB($$$EMailOVKischTEST) ; """Kisch OV."" <$$$EMailOVKischTEST>" + Set ServerPrefix="["_$$$Server_"] " +#EndIf + + Quit lbTo +]]> + + + +Destination +%String + + + + +%String + + + + +%Status + + + + Index: cspBasis/GAProdTBox.cls.xml =================================================================== diff -u -r128 -r135 --- cspBasis/GAProdTBox.cls.xml (.../GAProdTBox.cls.xml) (revision 128) +++ cspBasis/GAProdTBox.cls.xml (.../GAProdTBox.cls.xml) (revision 135) @@ -44,20 +44,21 @@ #define smCleanSave "CleanSave" ;s:('$D(%ClientIP)) %ClientIP="192.168.1.97" ;d WLIP^vhDBG(97,$G(sDomVERW)_" - "_$G(KLNr)_" - "_$$$LCVT(lbFlags)) - New blnVHEPN,blnLMC,blnHFLE,blnSFS,blnMBHO,blnHFLB,flgGetFrom,flgStorageMode,lbGetData,i,KLMini + New blnVHEPN,blnLMC,blnHFLE,blnSFS,blnMBHO,blnHFLB,blnKISCH,flgGetFrom,flgStorageMode,lbGetData,i,KLMini Do gkdInitialize Set KLMini="" For i=1:1:$LL(lbGetData) Do Quit:($IsObject(KLMini)) . Do:($LG(lbGetData,i)="Stg") gkdDataFromStorage . Do:($LG(lbGetData,i)="Ext") gkdDataFromExternal Quit KLMini gkdInitialize - Set blnVHEPN=(sDomVERW="VHEPN") - Set blnLMC=(sDomVERW="LMC") - Set blnHFLE=(sDomVERW="HFLE") - Set blnSFS=(sDomVERW="SFS") - Set blnMBHO=(sDomVERW="MBHO") - Set blnHFLB=(sDomVERW="HFLB") + Set blnVHEPN=(sDomVERW=##class(APPS.TBXWeb.enu.TBXHandel).VanHoecke()) + Set blnLMC=(sDomVERW=##class(APPS.TBXWeb.enu.TBXHandel).Optima()) + Set blnHFLE=(sDomVERW=##class(APPS.TBXWeb.enu.TBXHandel).HafeleNL()) + Set blnSFS=(sDomVERW=##class(APPS.TBXWeb.enu.TBXHandel).SFS()) + Set blnMBHO=(sDomVERW=##class(APPS.TBXWeb.enu.TBXHandel).MBHolland()) + Set blnHFLB=(sDomVERW=##class(APPS.TBXWeb.enu.TBXHandel).HafeleBE()) + Set blnKISCH=(sDomVERW=##class(APPS.TBXWeb.enu.TBXHandel).Kisch()) If blnVHEPN Do . Set flgGetFrom=$LG(lbFlags,$$$liGetFrom,"Ext") . Set flgStorageMode=$LG(lbFlags,$$$liStorageMode,$$$smNoAction) @@ -79,7 +80,7 @@ Set KLData=$G($$$GlobalKLData(sDomVERW,KLNr)) Quit:(KLData="") ; Else - If blnLMC||blnSFS||blnMBHO||blnHFLB Do + If blnLMC||blnSFS||blnMBHO||blnHFLB||blnKISCH Do . Do OPTIMAAnalyseData^cspBasis.TBX.DecodeURL.tmpDev(KLData,.tmpAr) ; Analyse only, KLData already decrypted . Set KLMini=##class(WS.TBX.KlantMini).%New() . Set KLMini.Taal =$G(tmpAr("Taal")) @@ -96,7 +97,7 @@ Quit gkdDataFromExternal New KLData - If blnLMC||blnSFS||blnMBHO||blnHFLB Do + If blnLMC||blnSFS||blnMBHO||blnHFLB||blnKISCH Do . Set KLMini=$$GetKlantDataViaQS(.KLData) . Set:(KLMini) KLNr=KLMini.Nummer Else If blnVHEPN Do @@ -113,7 +114,7 @@ Quit:(flgStorageMode=$$$smClean) Quit:('$IsObject(KLMini)) ; Else : Save the data - If blnLMC||blnSFS||blnMBHO||blnHFLB Do + If blnLMC||blnSFS||blnMBHO||blnHFLB||blnKISCH Do . Set $$$GlobalKLData(sDomVERW,KLNr)=KLData Quit @@ -137,8 +138,12 @@ . Quit:(Data="") If blnHFLB Do . Set Data=$G(%request.Data("DATAOPT",1)) - . Set Data=$$OPTIMADecryptData^cspBasis.TBX.DecodeURL.tmpDev(Data,.tmpAr,"HFLB") + . Set Data=$$OPTIMADecryptData^cspBasis.TBX.DecodeURL.tmpDev(Data,.tmpAr,##class(APPS.TBXWeb.enu.TBXHandel).HafeleBE()) . Quit:(Data="") + If blnKISCH Do + . Set Data=$G(%request.Data("DATAOPT",1)) + . Set Data=$$OPTIMADecryptData^cspBasis.TBX.DecodeURL.tmpDev(Data,.tmpAr,##class(APPS.TBXWeb.enu.TBXHandel).Kisch()) + . Quit:(Data="") If Data'="" Do . Set KLMini=##class(WS.TBX.KlantMini).%New() . Set KLMini.Taal =$$$ReplaceBackQuote($G(tmpAr("Taal"))) Index: PRGACNTs.inc.rou =================================================================== diff -u -r18 -r135 --- PRGACNTs.inc.rou (.../PRGACNTs.inc.rou) (revision 18) +++ PRGACNTs.inc.rou (.../PRGACNTs.inc.rou) (revision 135) @@ -111,6 +111,7 @@ #define SfsOptKey "SFS.unimarket2VH" #define MBHollandOptKey "NL_MeuHo.VH!lAdE" #define HafeleBEOptKey "BE-tbx.H@fele&VH" + #define KischOptKey "tBx&_KiSCH-nl2VH" ; Toegang voor OptimaFIX page : beperkt via controle op IP-adres ; !!! Te compileren in routines : Index: APPS/TBXWeb/TBXContext.cls.xml =================================================================== diff -u -r130 -r135 --- APPS/TBXWeb/TBXContext.cls.xml (.../TBXContext.cls.xml) (revision 130) +++ APPS/TBXWeb/TBXContext.cls.xml (.../TBXContext.cls.xml) (revision 135) @@ -121,6 +121,13 @@ 1 + + +Kisch (met login) (NL) +%Boolean +1 + + WebDomein:%String,HttpRequestDomein:%String="" 1 @@ -135,15 +142,16 @@ Set ..DomeinVerwerker=$LG(lbDomLU,1) Set ..DomeinKlantNummer=$LG(lbDomLU,2) - Set ..IsVHEPN=(..DomeinVerwerker="VHEPN") - Set ..IsHEIN=(..DomeinVerwerker="HEIN") - Set ..IsLMC=(..DomeinVerwerker="LMC") - Set ..IsDUPO=(..DomeinVerwerker="DUPO") - Set ..IsHELMY=(..DomeinVerwerker="HELMY") - Set ..IsHFLE=(..DomeinVerwerker="HFLE") - Set ..IsSFS=(..DomeinVerwerker="SFS") - Set ..IsMBHO=(..DomeinVerwerker="MBHO") - Set ..IsHFLB=(..DomeinVerwerker="HFLB") + Set ..IsVHEPN = (..DomeinVerwerker=##class(APPS.TBXWeb.enu.TBXHandel).VanHoecke()) + Set ..IsHEIN = (..DomeinVerwerker=##class(APPS.TBXWeb.enu.TBXHandel).Hein()) + Set ..IsLMC = (..DomeinVerwerker=##class(APPS.TBXWeb.enu.TBXHandel).Optima()) + Set ..IsDUPO = (..DomeinVerwerker=##class(APPS.TBXWeb.enu.TBXHandel).Dupont()) + Set ..IsHELMY = (..DomeinVerwerker=##class(APPS.TBXWeb.enu.TBXHandel).Destil()) + Set ..IsHFLE = (..DomeinVerwerker=##class(APPS.TBXWeb.enu.TBXHandel).HafeleNL()) + Set ..IsSFS = (..DomeinVerwerker=##class(APPS.TBXWeb.enu.TBXHandel).SFS()) + Set ..IsMBHO = (..DomeinVerwerker=##class(APPS.TBXWeb.enu.TBXHandel).MBHolland()) + Set ..IsHFLB = (..DomeinVerwerker=##class(APPS.TBXWeb.enu.TBXHandel).HafeleBE()) + Set ..IsKISCH = (..DomeinVerwerker=##class(APPS.TBXWeb.enu.TBXHandel).Kisch()) ; ... uit te breiden voor nieuwe domeinen Quit $$$OK @@ -199,49 +207,53 @@ Quit lbVal cdtFillArrayLU(arLookupTBX,Domain) If Domain="www.tandem-box.com" { - Set arLookupTBX("VERW")="VHEPN" + Set arLookupTBX("VERW")=##class(APPS.TBXWeb.enu.TBXHandel).VanHoecke() Set arLookupTBX("KLNR")="4682" } ElseIf Domain="tbx.tandem-box.de" { - Set arLookupTBX("VERW")="HEIN" + Set arLookupTBX("VERW")=##class(APPS.TBXWeb.enu.TBXHandel).Hein() Set arLookupTBX("KLNR")="7833" } ElseIf Domain="www.optima-tbx.fr" { - Set arLookupTBX("VERW")="LMC" + Set arLookupTBX("VERW")=##class(APPS.TBXWeb.enu.TBXHandel).Optima() Set arLookupTBX("KLNR")="6279" } ElseIf Domain="tbx.du-pont.be" { - Set arLookupTBX("VERW")="DUPO" + Set arLookupTBX("VERW")=##class(APPS.TBXWeb.enu.TBXHandel).Dupont() Set arLookupTBX("KLNR")="1736" } ElseIf Domain="tbx.destil.nl" { - Set arLookupTBX("VERW")="HELMY" + Set arLookupTBX("VERW")=##class(APPS.TBXWeb.enu.TBXHandel).Destil() Set arLookupTBX("KLNR")="4598" ; Old="2127" New="4598" (by WimV on 17/01/2006) } ElseIf Domain="hafele.tandem-box.com" { - Set arLookupTBX("VERW")="HFLE" + Set arLookupTBX("VERW")=##class(APPS.TBXWeb.enu.TBXHandel).HafeleNL() Set arLookupTBX("KLNR")="2671" } ElseIf Domain="tbx.sfsunimarket.biz" { - Set arLookupTBX("VERW")="SFS" + Set arLookupTBX("VERW")=##class(APPS.TBXWeb.enu.TBXHandel).SFS() Set arLookupTBX("KLNR")="12486" } ElseIf Domain="demo.tandem-box.com" { - Set arLookupTBX("VERW")="VHEPN" + Set arLookupTBX("VERW")=##class(APPS.TBXWeb.enu.TBXHandel).VanHoecke() Set arLookupTBX("KLNR")="6819" } ElseIf Domain="demo.sfsunimarket.biz" { - Set arLookupTBX("VERW")="SFS" + Set arLookupTBX("VERW")=##class(APPS.TBXWeb.enu.TBXHandel).SFS() Set arLookupTBX("KLNR")="12486" } ElseIf Domain=$$$TBoxWebDomeinMBHO { - Set arLookupTBX("VERW")="MBHO" + Set arLookupTBX("VERW")=##class(APPS.TBXWeb.enu.TBXHandel).MBHolland() Set arLookupTBX("KLNR")=$$$TBoxWebKlantNrMBHO } ElseIf Domain=$$$TBoxWebDomeinHFLB { - Set arLookupTBX("VERW")="HFLB" + Set arLookupTBX("VERW")=##class(APPS.TBXWeb.enu.TBXHandel).HafeleBE() Set arLookupTBX("KLNR")=$$$TBoxWebKlantNrHFLB } + ElseIf Domain=$$$TBoxWebDomeinKISCH { + Set arLookupTBX("VERW")=##class(APPS.TBXWeb.enu.TBXHandel).Kisch() + Set arLookupTBX("KLNR")=$$$TBoxWebKlantNrKISCH + } Else { Set arLookupTBX="" } @@ -265,8 +277,9 @@ "4598" : $$$TBoxWebDomeinHELMY, "2671" : $$$TBoxWebDomeinHFLE, "12486" : $$$TBoxWebDomeinSFS, - $$$TBoxWebKlantNrMBHO : $$$TBoxWebDomeinMBHO, - $$$TBoxWebKlantNrHFLB : $$$TBoxWebDomeinHFLB, + $$$TBoxWebKlantNrMBHO : $$$TBoxWebDomeinMBHO, + $$$TBoxWebKlantNrHFLB : $$$TBoxWebDomeinHFLB, + $$$TBoxWebKlantNrKISCH : $$$TBoxWebDomeinKISCH, : "" ) ; niet naar demo verwijzen ($$$TBoxWebDomeinDEMO) Quit WebDomein ]]> @@ -290,6 +303,7 @@ $$$TBoxWebDomeinSFS : "sfs", $$$TBoxWebDomeinMBHO : "mbho", $$$TBoxWebDomeinHFLB : "hfle.be", + $$$TBoxWebDomeinKISCH : "kisch", $$$TBoxWebDomeinDEMO : "demo", : WebDomein ) Quit DomeinKort @@ -315,6 +329,7 @@ "mbho" : $$$TBoxWebDomeinMBHO, "hfle.nl" : $$$TBoxWebDomeinHFLE, "hfle.be" : $$$TBoxWebDomeinHFLB, + "kisch" : $$$TBoxWebDomeinKISCH, "demo" : $$$TBoxWebDomeinDEMO, : DomeinKort ) Quit WebDomein @@ -419,7 +434,7 @@ %Boolean - @@ -433,10 +448,46 @@ %Boolean - + + +Geeft de Encryptiesleutel voor de DataOpt string. +Definitieve method, kan pas gebruikt worden na refactor van de code. +%String + + + + + +Geeft de Encryptiesleutel voor de DataOpt string. +Tijdelijke method, die DomeinVerwerker als param doorgeeft, i.p.v. aan de "echte" TBXContext te vragen. +Oproepen via : w ##class(APPS.TBXWeb.TBXContext).%New("","").GeefDataOptKeyVoorDomVerwerker(sDomVERW) +Mag weg na refactor van de code. +sDomVERW:%String +%String + + + + +sDomVERW:%String +1 +%String + + + Toegang voor de TestDataOpt page : beperkt via controle op IP-adres @@ -558,7 +609,7 @@ %Boolean @@ -569,14 +620,14 @@ %Boolean @@ -587,7 +638,7 @@ De nieuwe handels maken gebruik van de klasse APPS.TBXWeb.OrderHandling voor de verzonden bestellingen De vroeger geïmplementeerde handels versturen de mails via de implementatie in routine csp.vhisie.TBX.MailResult.tmpDev.MAC %Boolean - @@ -596,7 +647,7 @@ Bij bestelling verzenden naar VH wijzigt het BonType van BBON naar INKP (is enkel voor externe domeinen) %Boolean - @@ -607,15 +658,15 @@ Bij de andere domeinen wordt een ingave (offerte) verzonden als bestelbon, wat overeenkomt met "Goed voor Order" --> OFFTOBBON=1 Een prijsaanvraag voor 'Anonymous' gebruikers loopt via een OfferteAanvraag, i.e. BonType="OFFAV" ]]> %Boolean - Geeft de munteenheid van het domein %String - @@ -648,8 +699,8 @@ Set ToonKnop=0 If ..IsVHEPN { // Reeds eerder toegelaten klanten : (nieuwe KLNr's vooraan toevoegen --> historiek) - // KLNr= 999999 / 9936 / 14937 / 12848 / 14484 / 3524 / 8575 / 5977 / 10096 /10939 / 4137 / 10547 / 5872 / 8537 / 4874 / 1093 / 8537 / 2118 --> 999999 = disabled - If KLNr=999999 { + // KLNr= 999999 / 6019 / 9936 / 14937 / 12848 / 14484 / 3524 / 8575 / 5977 / 10096 /10939 / 4137 / 10547 / 5872 / 8537 / 4874 / 1093 / 8537 / 2118 --> 999999 = disabled + If KLNr=6019 { Set ToonKnop=1 } } @@ -707,14 +758,15 @@ Taal:%String %String @@ -724,7 +776,7 @@ Toon de sectie Index op de helppagina (HowTo.csp) %Boolean - @@ -733,7 +785,7 @@ Contactgegevens van de klant in stap 1 (PData) van de Wizard. Typisch worden deze verborgen voor klanten via DataOpt %Boolean - @@ -742,15 +794,15 @@ De nieuwere handels zullen typisch ervoor kiezen om levertijd niet in te vullen in de wizard, maar pas later bij "Bestelling plaatsen" Voor deze domeinen kan het veld Levertijd verborgen worden in de wizard. Ook de javascript-controle op dit veld zal dan niet actief zijn. %Boolean - ContactInfo op de Helppagina %Boolean - @@ -799,7 +851,8 @@ "HELMY": "info@destil.nl", "HFLE" : "info@hafele.nl", "SFS" : "info.u@sfsunimarket.biz", - "MBHO" : $$$EMailICTAdminMbho, + ##class(APPS.TBXWeb.enu.TBXHandel).MBHolland() : $$$EMailICTAdminMbho, + ##class(APPS.TBXWeb.enu.TBXHandel).Kisch() : $$$EMailICTAdminKisch, : "ICT_SOAPSysOp@vanhoecke.be" ) ]]> @@ -829,7 +882,7 @@ ElseIf (..IsSFS) { Set lbBulkConfig=##class(cspBasis.GAProdTBox).GetKlantBulk(..GeefDomeinVerwerker(),KLNr) } - ElseIf (..IsMBHO||..IsHFLB) { + ElseIf (..IsMBHO||..IsHFLB||..IsKISCH) { Set lbBulkConfig="" } Else { Index: APPS/TBXWeb/enu/TBXHandel.cls.xml =================================================================== diff -u -r33 -r135 --- APPS/TBXWeb/enu/TBXHandel.cls.xml (.../TBXHandel.cls.xml) (revision 33) +++ APPS/TBXWeb/enu/TBXHandel.cls.xml (.../TBXHandel.cls.xml) (revision 135) @@ -7,7 +7,7 @@ 0 -,VHEPN,HEIN,LMC,DUPO,HELMY,HFLE,SFS,MBHO,HFLB +,VHEPN,HEIN,LMC,DUPO,HELMY,HFLE,SFS,MBHO,HFLB,KISCH @@ -51,6 +51,13 @@ ]]> + +1 +%String + + + Optima groep is LMC (FR) Index: csp/vhisie/TBX/MailResult/tmpDev.mac.rou =================================================================== diff -u -r33 -r135 --- csp/vhisie/TBX/MailResult/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 33) +++ csp/vhisie/TBX/MailResult/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 135) @@ -297,7 +297,11 @@ $$$ThrowError($$$errGeneralError,"OrderHandling via Old method is disabled. OrderHandling must use new implementation.") Quit +tsmMailFldsKISCH + $$$ThrowError($$$errGeneralError,"OrderHandling via Old method is disabled. OrderHandling must use new implementation.") + Quit + tsmMailFldsVHEPN ;Set From=$S($$$EMailValid(WSOrd.KLEMail):$S($L(WSOrd.KLNaam):""""_WSOrd.KLNaam_""" ", 1:"")_"<"_WSOrd.KLEMail_">", 1:""""_$S($L(WSOrd.KLNaam):WSOrd.KLNaam, 1:"Anonymous")_""" ") Set From=""""_$S($L(WSOrd.KLNaam):WSOrd.KLNaam, 1:"Anonymous")_""" <"_$$$EMailFrom2Any_">" Index: APPS/TBXWeb/EMailAdressen.inc.rou =================================================================== diff -u -r40 -r135 --- APPS/TBXWeb/EMailAdressen.inc.rou (.../EMailAdressen.inc.rou) (revision 40) +++ APPS/TBXWeb/EMailAdressen.inc.rou (.../EMailAdressen.inc.rou) (revision 135) @@ -60,12 +60,24 @@ ; #define EMailOVHflbTEST """MBHO OV."" " #define EMailAKHflb """Hafele.be TBX Inkoop"" " + #define EMailAnon2Kisch "AdminTBX@vanhoecke.be" + #define EMailOVKisch2VH "OV_TBX_KLANT@vanhoecke.be" + #define EMailOVKisch2VHTEST """OV_TBX_KISCH"" " + #define EMailOVKisch """KISCH OV."" " + ; #define EMailOVKischBis """KISCH OV."" " + #define EMailOVKischTEST """KISCH OV."" " + #define EMailAKKisch """KISCH TBX Inkoop"" " + + ; === E-mail adressen voor andere info === #define EMailTBXInfo2Hein "info@tandem-box.de" #define EMailTBXInfo2SfsFR "ferrements@sfsunimarket.biz" #define EMailTBXInfo2SfsDU "beschlaege@sfsunimarket.biz" #define EMailTBXInfo2Mbho "info@meubelbeslagholland.nl" #define EMailTBXInfo2Hflb "info@hafele.be" + #define EMailTBXInfo2Kisch "info@kisch.nl" ; === E-mail adressen voor ICT-administrator === (in geval van fout bij "Verzenden van het Order") - #define EMailICTAdminMbho "info@meubelbeslagholland.nl" \ No newline at end of file + #define EMailICTAdminMbho "info@meubelbeslagholland.nl" + #define EMailICTAdminKisch "info@kisch.nl" + \ No newline at end of file Index: cspBasis/TBX/DecodeURL/tmpDev.mac.rou =================================================================== diff -u -r100 -r135 --- cspBasis/TBX/DecodeURL/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 100) +++ cspBasis/TBX/DecodeURL/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 135) @@ -132,7 +132,7 @@ . If blnRedir Set %session.Data("UserType")=UserType . Else Kill %session.Data("UserType") - If (blnLMC||blnSFS||blnMBHO||blnHFLB) && ( $$$Not(TBXContext.IsKlantIDIngevuld($G(RefArray("KLNR")))) ) Do + If (TBXContext.KlantGegevensViaDataOpt()) && ( $$$Not(TBXContext.IsKlantIDIngevuld($G(RefArray("KLNR")))) ) Do . Set blnRedir=0 . Set LoginState="ERR" @@ -214,7 +214,8 @@ Set luSafe($$$TBoxWebDomeinMBHO,"MBHO","ENC")="meubelgeheimMBHO" Set luSafe($$$TBoxWebDomeinMBHO,"VHEPN","PSW")="auftrage" ; "pwd4682VH" Set luSafe($$$TBoxWebDomeinMBHO,"VHEPN","ENC")="meubelgeheimMBHO" - Set luSafe($$$TBoxWebDomeinHFLB,"?","?")="" ; Wordt niet meer aangevuld, want wordt nauwelijks nog gebruikt + Set luSafe($$$TBoxWebDomeinHFLB,"?","?")="" ; luSafe wordt niet meer aangevuld, want wordt nauwelijks nog gebruikt ( !!! luTBX hieronder nog wel aanvullen) + Set luSafe($$$TBoxWebDomeinKISCH,"?","?")="" ; luSafe wordt niet meer aangevuld, want wordt nauwelijks nog gebruikt ( !!! luTBX hieronder nog wel aanvullen) ; luTBX ; Temporary copied local values from (class(WS.TBX.Order).DomaimLookup/cdtFillArrayLU): Set luTBX("www.tandem-box.com","UserType","VHEPN")=$$$utVerwAdmin @@ -237,12 +238,14 @@ Set luTBX($$$TBoxWebDomeinMBHO,"UserType","MBHO")=$$$utVerwDomain Set luTBX($$$TBoxWebDomeinHFLB,"UserType","VHEPN")=$$$utVerwAdmin Set luTBX($$$TBoxWebDomeinHFLB,"UserType","HFLB")=$$$utVerwDomain + Set luTBX($$$TBoxWebDomeinKISCH,"UserType","VHEPN")=$$$utVerwAdmin + Set luTBX($$$TBoxWebDomeinKISCH,"UserType","KISCH")=$$$utVerwDomain Quit ophGetUserType(KLNr,Domain,Verw,Mode) #If $$$NSpace="xDEMO" Quit:(Mode="A") $S(1:$$$utKlantAnon) #Else - Quit:(Mode="A") $S(blnHEIN||blnDUPO||blnHELMY||blnHFLE:$$$utKlantAnonWP, TBXContext.IsKlantIDIngevuld(KLNr):$$$utKlantKnown, 1:$$$utKlantAnon) ; blnLMC,blnSFS,blnMBHO, : $$$utKlantKnown + Quit:(Mode="A") $S(blnHEIN||blnDUPO||blnHELMY||blnHFLE:$$$utKlantAnonWP, TBXContext.IsKlantIDIngevuld(KLNr):$$$utKlantKnown, 1:$$$utKlantAnon) #EndIf Quit:(Mode="W") $$ophGetVERWType(Domain,Verw) Quit:(Mode="P") $$$utKlantAnon ; Temporary: fixed value @@ -370,7 +373,8 @@ New OptimaKey,Data Kill arData Quit:($G(encData)="") "" - Set OptimaKey=$S(sDomVERW="LMC":$$$OptimaKey, sDomVERW="SFS":$$$SfsOptKey, sDomVERW="MBHO":$$$MBHollandOptKey, sDomVERW="HFLB":$$$HafeleBEOptKey, 1:ERROR) + Set OptimaKey=##class(APPS.TBXWeb.TBXContext).%New("").GeefDataOptKeyVoorDomVerwerker(sDomVERW) ; $S(sDomVERW="LMC":$$$OptimaKey, sDomVERW="SFS":$$$SfsOptKey, sDomVERW="MBHO":$$$MBHollandOptKey, sDomVERW="HFLB":$$$HafeleBEOptKey, 1:ERROR) + Set:(OptimaKey="") OptimaKey=ERROR ; Trigger error If ($G(%blnBuildRef))&&($$$NotEncrypted(encData)) Set Data=encData Else Set Data=$$ophDecryptHashedRef(encData,OptimaKey) Do OPTIMAAnalyseCommon(.Data,,.encData) @@ -412,6 +416,7 @@ OPTIMAEncryptData(Data,sDomVERW) New OptimaKey,encData Quit:($G(Data)="") "" - Set OptimaKey=$S(sDomVERW="LMC":$$$OptimaKey, sDomVERW="SFS":$$$SfsOptKey, sDomVERW="MBHO":$$$MBHollandOptKey, sDomVERW="HFLB":$$$HafeleBEOptKey, 1:ERROR) + Set OptimaKey=##class(APPS.TBXWeb.TBXContext).%New("").GeefDataOptKeyVoorDomVerwerker(sDomVERW) ; $S(sDomVERW="LMC":$$$OptimaKey, sDomVERW="SFS":$$$SfsOptKey, sDomVERW="MBHO":$$$MBHollandOptKey, sDomVERW="HFLB":$$$HafeleBEOptKey, 1:ERROR) + Set:(OptimaKey="") OptimaKey=ERROR ; Trigger error Set encData=$$ophEncryptRefHashed(Data,.OptimaKey) Quit encData \ No newline at end of file Index: csp/vhisie/TBX/BuildRef/tmpDev.mac.rou =================================================================== diff -u -r96 -r135 --- csp/vhisie/TBX/BuildRef/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 96) +++ csp/vhisie/TBX/BuildRef/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 135) @@ -48,7 +48,7 @@ Do . Set %blnBuildRef=1 . Set DataOpt=$G(%request.Data("DATAOPT",1)) - . Set DataOptOut=$$OPTIMADecryptData^cspBasis.TBX.DecodeURL.tmpDev(DataOpt,,$S(VERW="SFS":"SFS", VERW="LMC":"LMC", VERW="MBHO":"MBHO", VERW="HFLB":"HFLB", 1:"")) + . Set DataOptOut=$$OPTIMADecryptData^cspBasis.TBX.DecodeURL.tmpDev(DataOpt,,$S(VERW="SFS":"SFS", VERW="LMC":"LMC", VERW="MBHO":"MBHO", VERW="HFLB":"HFLB", VERW="KISCH":"KISCH", 1:"")) . Kill %blnBuildRef If ($G(%request.Data("SUBMIT",1))="Encrypt") Do @@ -59,7 +59,7 @@ . ;If $L($G(%request.Data("DATAOPT",1))) Do . If $L(DataOpt) Do .. Set DataOptCheck=DataOpt - .. Set EncDataOptOut=$$OPTIMAEncryptData^cspBasis.TBX.DecodeURL.tmpDev(DataOpt,$S(VERW="SFS":"SFS", VERW="LMC":"LMC", VERW="MBHO":"MBHO", VERW="HFLB":"HFLB", 1:"")) + .. Set EncDataOptOut=$$OPTIMAEncryptData^cspBasis.TBX.DecodeURL.tmpDev(DataOpt,$S(VERW="SFS":"SFS", VERW="LMC":"LMC", VERW="MBHO":"MBHO", VERW="HFLB":"HFLB", VERW="KISCH":"KISCH", 1:"")) .. ;Set EncDataOptOut=$system.Encryption.Base64Decode($TR(EncDataOptOut,"_-","+=")) . ;New Page,UrlTaal . Set Page=$G(%request.Data("PAGE",1)) @@ -141,14 +141,15 @@ Else If sDomVERW="LMC" Set blnNoAccess=$$$Not($$$AccessTestPageDataOptLMC(%RemoteIP)||($$IsInternIPAdres^cspBasis.Library(%RemoteIP))) || 1 ; blocked for all IP Else If sDomVERW="MBHO" Set blnNoAccess=$$$Not($$$AccessTestPageDataOptMBHO(%RemoteIP)||($$IsInternIPAdres^cspBasis.Library(%RemoteIP))) Else If sDomVERW="HFLB" Set blnNoAccess=$$$Not($$$AccessTestPageDataOptHFLB(%RemoteIP)||($$IsInternIPAdres^cspBasis.Library(%RemoteIP))) + Else If sDomVERW="KISCH" Set blnNoAccess=1 Else Set blnNoAccess=1 d WLIP^vhDBG(97,"blnNoAccess="_blnNoAccess_"") Set RefOut=Ref If 'blnNoAccess Do . Set %blnBuildRef=1 . Set DataOpt=$G(%request.Data("DATAOPT",1)) - . Set DataOptOut=$$OPTIMADecryptData^cspBasis.TBX.DecodeURL.tmpDev(DataOpt,.tmpAr,$S(sDomVERW="SFS":"SFS", sDomVERW="MBHO":"MBHO", sDomVERW="HFLB":"HFLB", 1:"LMC")) + . Set DataOptOut=$$OPTIMADecryptData^cspBasis.TBX.DecodeURL.tmpDev(DataOpt,.tmpAr,$S(sDomVERW="SFS":"SFS", sDomVERW="MBHO":"MBHO", sDomVERW="HFLB":"HFLB", sDomVERW="KISCH":"KISCH", 1:"LMC")) . Kill %blnBuildRef Set tmpTaal=$G(tmpAr("Taal")) Set:(tmpTaal?1(1"N",1"F",1"E",1"D")) Taal=tmpTaal @@ -190,19 +191,20 @@ . ;If $L($G(%request.Data("DATAOPT",1))) Do . If $L(DataOpt) Do .. Set DataOptCheck=DataOpt - .. Set EncDataOptOut=$$OPTIMAEncryptData^cspBasis.TBX.DecodeURL.tmpDev(DataOpt,$S(sDomVERW="SFS":"SFS", sDomVERW="MBHO":"MBHO", sDomVERW="HFLB":"HFLB", 1:"LMC")) + .. Set EncDataOptOut=$$OPTIMAEncryptData^cspBasis.TBX.DecodeURL.tmpDev(DataOpt,$S(sDomVERW="SFS":"SFS", sDomVERW="MBHO":"MBHO", sDomVERW="HFLB":"HFLB", sDomVERW="KISCH":"KISCH", 1:"LMC")) .. ;Set EncDataOptOut=$system.Encryption.Base64Decode($TR(EncDataOptOut,"_-","+=")) .. If blnKeySteps Do ophOPTIMAIntermediates(DataOpt,sDomVERW) . ;New Page,UrlTaal . Set Page=$G(%request.Data("PAGE",1)) . Set UrlTaal=$G(%request.Data("URLTAAL",1)) . Set UrlOut=$S($L(Page):Page_"?REF="_EncRefOut_$S($L(UrlTaal):"&Taal="_UrlTaal,1:""), 1:"") - Do ophAddToLog($S(sDomVERW="LMC":"TESTOPTIMA", sDomVERW="SFS":"TESTOPTSFS", sDomVERW="MBHO":"TESTOPTMBHO", sDomVERW="HFLB":"TESTOPTHFLB", 1:"TESTDATAOPT")) + Do ophAddToLog($S(sDomVERW="LMC":"TESTOPTIMA", sDomVERW="SFS":"TESTOPTSFS", sDomVERW="MBHO":"TESTOPTMBHO", sDomVERW="HFLB":"TESTOPTHFLB", sDomVERW="KISCH":"TESTOPTKISCH", 1:"TESTDATAOPT")) Quit 1 ophOPTIMAIntermediates(Data,sDomVERW) New OptimaKey,encData,Step1,Step2,Step3,Step4,Step2Hex Quit:($G(Data)="") "" - Set OptimaKey=$S(sDomVERW="LMC":$$$OptimaKey, sDomVERW="SFS":$$$SfsOptKey, sDomVERW="MBHO":$$$MBHollandOptKey, sDomVERW="HFLB":$$$HafeleBEOptKey, 1:ERROR) + Set OptimaKey=##class(APPS.TBXWeb.TBXContext).%New("").GeefDataOptKeyVoorDomVerwerker(sDomVERW) + Set:(OptimaKey="") OptimaKey=ERROR ; Trigger error Set Step1=Data Set Step2=$system.Encryption.AESEncode(Step1,OptimaKey) Set Step3=$TR($system.Encryption.Base64Encode(Step2),$$$CRLF,"") Index: APPS/TBXWeb/impl/VHEPNOrderHandler.cls.xml =================================================================== diff -u -r40 -r135 --- APPS/TBXWeb/impl/VHEPNOrderHandler.cls.xml (.../VHEPNOrderHandler.cls.xml) (revision 40) +++ APPS/TBXWeb/impl/VHEPNOrderHandler.cls.xml (.../VHEPNOrderHandler.cls.xml) (revision 135) @@ -25,10 +25,10 @@ ")) _ $S(..Requester'?1(1"HELMY",1"SFS",1"DUPO"):$LB("ICT_SupportTBX@vanhoecke.be"), 1:"") + Set lbTo=$S(..Requester="SFS":$LB($$$EMailOVSfs2VH) , ..Requester="MBHO":$LB($$$EMailOVMbho2VH) , ..Requester="HFLB":$LB($$$EMailOVHflb2VH ), ..Requester="KISCH":$LB($$$EMailOVKisch2VH) , 1:$LB("""OV_TBX_KLANT"" ")) _ $S(..Requester'?1(1"HELMY",1"SFS",1"DUPO"):$LB("ICT_SupportTBX@vanhoecke.be"), 1:"") Set ServerPrefix="" #Else - Set lbTo=$S(..Requester="SFS":$LB($$$EMailOVSfs2VHTEST), ..Requester="MBHO":$LB($$$EMailOVMbho2VHTEST), ..Requester="HFLB":$LB($$$EMailOVHflb2VHTEST), 1:$LB("""OV_TBX_KLANT"" ")) _ $S(..Requester'?1(1"HELMY",1"SFS",1"HFLB",1"DUPO"):$LB("ICT_SupportTBX@vanhoecke.be"), 1:"") + Set lbTo=$S(..Requester="SFS":$LB($$$EMailOVSfs2VHTEST), ..Requester="MBHO":$LB($$$EMailOVMbho2VHTEST), ..Requester="HFLB":$LB($$$EMailOVHflb2VHTEST), ..Requester="KISCH":$LB($$$EMailOVKisch2VHTEST), 1:$LB("""OV_TBX_KLANT"" ")) _ $S(..Requester'?1(1"HELMY",1"SFS",1"HFLB",1"DUPO"):$LB("ICT_SupportTBX@vanhoecke.be"), 1:"") Set ServerPrefix="["_$$$Server_"] " #EndIf @@ -71,7 +71,7 @@ If (..Requester="VHEPN") { Set From=""""_$S($L(..WSOrd.KLNaam):..WSOrd.KLNaam, 1:"Anonymous")_""" <"_$$$EMailFrom2Any_">" } Else { - Set From=$CASE(..Requester, "HELMY":$$$EMailAKHelmY, "SFS":$$$EMailAKSfs, "MBHO":$$$EMailAKMbho, "HFLB":$$$EMailAKHflb, "HFLE":$$$EMailAKHfle, "DUPO":$$$EMailAKDupo, :$$$EMailAKUnknown) + Set From=$CASE(..Requester, "HELMY":$$$EMailAKHelmY, "SFS":$$$EMailAKSfs, "MBHO":$$$EMailAKMbho, "HFLB":$$$EMailAKHflb, "HFLE":$$$EMailAKHfle, "DUPO":$$$EMailAKDupo, "KISCH":$$$EMailAKKisch, :$$$EMailAKUnknown) } Quit From ]]>