Index: HADWIZ.mac.rou
===================================================================
diff -u -r66932 -r75045
--- HADWIZ.mac.rou	(.../HADWIZ.mac.rou)	(revision 66932)
+++ HADWIZ.mac.rou	(.../HADWIZ.mac.rou)	(revision 75045)
@@ -87,19 +87,9 @@
  Quit Key
 NewIPCom2(Groep,Actie) 
  New Key,IP
- Do WLIP^vhDBG(97,"Test IP")
  Set IP = ##class(TECH.Process).GeefClientIP()
  ;Set IP=$$GetClientIP^vhLib()
- Quit:IP'?1.3N1"."1.3N1"."1.3N1"."1.3N ""
- Lock +^IPCom("N")
- Set Key=$G(^IPCom("N"))+1
- Set ^IPCom("N")=Key
- Lock -^IPCom("N")
- Kill ^IPCom("D",Key)
- Set ^IPCom("IP",IP)=Key
- Do ##class(vhLib.Logger).%New("TBX_CREATE").Info("IPComNewKey","IPCom2 entry added : "_$Name(^IPCom("IP",IP))_" = "_Key)
- Kill ^IPCom("D",Key)
- Set ^IPCom("D",Key)=Groep_"`"_Actie_"`"_$H_"`"_IP
+ Set Key = ##class(BL.Legacy.IPComService).GeefNieuweIpComKey(Groep,Actie,IP)
  Quit Key
  
 DISPLAY(PRNr,Aantal,Munt) 
@@ -122,8 +112,18 @@
 	 Quit
  }
  ElseIf (ProductTypeAPI.IsTandemboxProduct(PRNr)) {
-	 #dim BestandLocatie As %String = ##class(APPS.PM.Maatwerk.MaatwerkDoc).%New().GeefProductDisplayURL(PRNr)
-	 Do:(BestandLocatie'="") DisplayDoc(BestandLocatie,0) 
+	 #dim GADataID As %String =$P(^KPR(PRNr,"G"),"\",13)
+	 #dim BlnExists As %Boolean =##class(Prod.GAData.Product).%ExistsId(GADataID)
+	 #dim BestandLocatie As %String
+	 
+	 If (BlnExists) {
+		Set BestandLocatie = ##class(APPS.PM.Maatwerk.MaatwerkDoc).%New().GeefProductDisplayURL(PRNr)
+		Do:(BestandLocatie'="") DisplayDoc(BestandLocatie,0) 
+	 } Else {
+		#dim BestandLocatie As %String = ##class(BL.Legacy.HADWIZ).%New().GenereerProductDetailBlad(PRNr, IsKaderdeurProduct)
+	 	Do:(BestandLocatie'="") DisplayDoc(BestandLocatie)
+	 }
+	 
 	 Do REFRESH^vhTERMINA()
 	 Quit
  }
@@ -165,10 +165,10 @@
 	
 	Quit:'##class(Res.ImageLink).HasImage("PR",PRNr)&&'(IsOrgal&&$L(##class(cspBasis.ProductList).DataDefValueURL("N",$$$OLGroep,KenmID,"InfoSleutel","LB")))
 	New R,K,FP,FilePath,ID
-	set Qstring = $system.Encryption.Base64Encode($system.Encryption.AESEncode("PRNR="_PRNr_"&Taal=N","1q2gg34l5U6p789Q"))
-	Set FilePath="http://res.vanhoecke.be/Catalog/Product.aspx?"_Qstring
+	Set FilePath = ##class(BL.Legacy.HADWIZ).%New().GeefProductInfoUrlVhisie4(PRNr,"N")
 	Set Url=FilePath
 	Do:$L(FilePath)
+	. do ##class(vhLib.Logger).%New("HADWIZ").Info("ProductInfoUrl","Z-toets in Admin; PRNr='"_PRNr_"';  Url : "_Url)
 	. Do STORE^vhTERMINA()
 	. ; Oproep Internet Explorer
 	. Set Url1=$P(Url,"?")_"?"