Index: csp/vhisie/TBX/Main/tmpDev.mac.rou =================================================================== diff -u -r1573 -r1726 --- csp/vhisie/TBX/Main/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 1573) +++ csp/vhisie/TBX/Main/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 1726) @@ -440,7 +440,7 @@ Set arShow("NotRegUserInfoOPTIMA","INFO")=(TBXContext.KlantGegevensViaDataOpt())&&(KLNr="") ; &&('$D(%session.Data("DA TAOPT")))) Quit ophMMComplete - New WSOrd,blnDynaplugERR + New WSOrd,blnDynaplugERR,IsDesignBeschikbaar,DS Set WSOrd=$S($L(wsID):##class(WS.TBX.Order).%OpenId(wsID), 1:0) ; Show Order Details @@ -456,20 +456,20 @@ . Set blnDynaplugERR=(''$G(blnWSErrors,0)) Else Do . Set blnDynaplugERR=0 - ;Set blnOFFVervallen=($IsObject(WSOrd))&&(WSOrd.BonType="OFF")&&(WSOrd.DagenVervallen()>0) ;Oude berekening + Set IsDesignBeschikbaar=('$IsObject(WSOrd))||(WSOrd.IsLadeDesignBeschikbaar(.DS)) Set blnOFFVervallen=($IsObject(WSOrd))&&(WSOrd.IsOfferteVervallen($H,.RedenVervallen)) - ;d WL^vhDBG("RedenVervallen : "_$G(RedenVervallen)) If blnOFFVervallen Do Quit:($G(blnQuit,0)) . Set blnQuit=$$ophMMCompleteRecalcOFF() ; Else Prepare buttons Do MShowNotRegUser - Do MShowVervaldagOFFText + Do:(IsDesignBeschikbaar) MShowVervaldagOFFText + ; Positie van de tekst t.o.v. de buttons Set TextPos=$S($IsObject(WSOrd)&&(WSOrd.IsSubmitted()):"LEFT", KLNr=$$$KLNrListAll:"LEFT", 1:"RIGHT") ; Button RecalcOrder Do MShowRecalcOrder(blnOFFVervallen,$G(RedenVervallen)) ; Button PrintPage - Do MShowPrintPage(1,blnOFFVervallen||blnDynaplugERR) + Do MShowPrintPage(1,blnOFFVervallen||blnDynaplugERR||$$$Not(IsDesignBeschikbaar)) ; Button BookmarkPage Do MShowBookmarkPage('$IsValidNum(KLNr),WSOrd) ; Button Show XML @@ -513,18 +513,19 @@ Quit 0 ophMMProcess - New WSOrd,blnProcessVH,blnQuit,blnAllowBulk + New WSOrd,blnProcessVH,blnQuit,blnAllowBulk,IsDesignBeschikbaar,DS Set blnProcessVH=(TBXContext.IsDomeinVHEPN())||(VERW="VHEPN") If blnProcessVH Do Quit:($G(blnQuit,0)) . Set blnQuit=$$ophMMProcessFlowVHEPN ;Else : prepare buttons/info Do MShowKnownCustomer(1) - ;d WL^vhDBG("ophMMProcess") Do ophBuildToggleHistAndOrder() Set WSOrd=$S($L(wsID):##class(WS.TBX.Order).%OpenId(wsID), 1:0) Quit:('$IsObject(WSOrd)) ; Show Order Details Set arShow("DisplayOrder","DTL")=$IsObject(WSOrd) + Set IsDesignBeschikbaar=(WSOrd.IsLadeDesignBeschikbaar(.DS)) + Do MShowVervaldagOFFText ; Positie van de tekst t.o.v. de buttons Set TextPos="RIGHT" ; $S($IsObject(WSOrd)&&(WSOrd.IsSubmitted()):"LEFT", 1:"RIGHT") @@ -533,7 +534,7 @@ ; Button SwitchToViewMode Do MShowSwitchToViewMode(('TBXContext.IsDomeinVHEPN())&& 1) ; &&(WSOrd.BonType="INKP") ; Button PrintPage - Do MShowPrintPage(1) ;VERW="VHEPN") + Do MShowPrintPage(1,$$$Not(IsDesignBeschikbaar)) ;VERW="VHEPN") ; Button Show XML Do MShowExportXML(VERW="VHEPN") ; Button Calculate Order @@ -770,6 +771,7 @@ MShowRecalcOrder(Visible,RedenVervallen) Quit:('Visible) Quit:('$G(blnValidKlant,1)) + Quit:(RedenVervallen=##class(APPS.TBXWeb.enu.RedenOfferteVervallen).DesignNietBeschikbaar()) New tmpAr Merge tmpAr=tmpRq Kill tmpAr("RECALC") @@ -990,6 +992,7 @@ Set WSLn=WSOrd.Lijnen.GetNext("") If WSLn Do . Set dcID=##class(BL.PR.GA.TandemBox).DesignCodeFromDS(WSLn.ItemDS) + . Set:(dcID="") dcID="S" . Set HeaderLogo = dcID . //Set:(dcID="I") HeaderLogo="I" . Set:($L(WSLn.ItemDS)) DCSuffix=$$$Replace($$$pg.WebTextValue("DC_Suffix_"_dcID,Taal,"L"),"~","")