Index: BL/Legacy/HADWIZ.cls.xml
===================================================================
diff -u -r73820 -r74756
--- BL/Legacy/HADWIZ.cls.xml	(.../HADWIZ.cls.xml)	(revision 73820)
+++ BL/Legacy/HADWIZ.cls.xml	(.../HADWIZ.cls.xml)	(revision 74756)
@@ -7,18 +7,31 @@
 <Type>%ListOfDataTypes</Type>
 </Property>
 
+<Property name="ConfigMgr">
+<Type>TECH.Config.ConfigMgr</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ProductApi">
+<Type>DOM.PM.ProductAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="Logger">
 <Type>vhLib.Logger</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
+<FormalSpec>ProductApi:DOM.PM.ProductAPI=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..ProductLijnen = ##class(%ListOfDataTypes).%New()
+	Set ..ConfigMgr = ##class(TECH.Config.ConfigMgr).Instance()
+	Set ..ProductApi = $$$Inject(ProductApi, ##class(DOM.PM.impl.ProductAPI).%New())
 	Set ..Logger = ##class(vhLib.Logger).%New()
 	Quit $$$OK
 ]]></Implementation>
@@ -194,18 +207,20 @@
 </Method>
 
 <Method name="GeefProductInfoUrlVhisie4">
-<ClassMethod>1</ClassMethod>
+<Description>
+Voobeeld : 
+  Returnvalue: https://www-test.vanhoecke.be/nl/product/decrypt/iTYqj5vudgCR0rIEUYeM1A--   (DEV)</Description>
 <FormalSpec>ProductId:%String,Taal:%String="N"</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim AesKey As %String = "wG1wFnu08vM78FzL"
+	#dim ProductInfoAesKey As %String = ..ConfigMgr.GeefString("BL.Legacy.HADWIZ_ProductInfoAesKey")
+	#dim ProductInfoDomein As %String = ..ConfigMgr.GeefString("BL.Legacy.HADWIZ_ProductInfoDomein")
 	
 	#dim ProductAlsUrlInput As %String = ""
-	#dim ProductApi As DOM.PM.ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
 	
-	If ProductApi.BestaatProduct(ProductId) {
-		#dim IdentNummer As %String = ProductApi.GeefProduct(ProductId).GeefIdentNr()
-		#dim EncryptedValue As %String = $System.Encryption.Base64Encode($System.Encryption.AESCBCEncrypt(IdentNummer,AesKey,""))
+	If ..ProductApi.BestaatProduct(ProductId) {
+		#dim IdentNummer As %String = ..ProductApi.GeefProduct(ProductId).GeefIdentNr()
+		#dim EncryptedValue As %String = $System.Encryption.Base64Encode($System.Encryption.AESCBCEncrypt(IdentNummer,ProductInfoAesKey,""))
 		Set ProductAlsUrlInput = $Translate(EncryptedValue, "/+=", "!_-")
 	}
 	#dim SubFolder As %String = $Case(Taal, 
@@ -216,8 +231,7 @@
 			 : "/nl")
 	Set SubFolder = SubFolder _ "/product/decrypt"
 	
-	// TODO : domeinnaam in config-item steken (?) 
-	Quit "https://www.vanhoecke.be" _ SubFolder _ "/" _ ProductAlsUrlInput
+	Quit ProductInfoDomein _ SubFolder _ "/" _ ProductAlsUrlInput
 ]]></Implementation>
 </Method>
 
@@ -245,12 +259,13 @@
 	set InputParameters.ProductID = ProductID
 
 	#dim Bestand As %String = ..GeefBestandNaam(ProductID)
-	#dim IsActiefDocBaseV7 As %Boolean = ##class(BL.Sys.FOP.DocBaseV7Helper).StelInEnGeefTerugTijdelijkActiefVoorFakeTask(";PRODUCTIEDETAILBLAD;FileDoc;","\inetpub\pdfs")
+	#dim IsActiefDocBaseV7 As %Boolean = $$$True   ; Dit was conditioneel tijdens de overgangsfase 
 	If IsActiefDocBaseV7 && $$$Not(IsKaderdeurProduct) {
 		Set WebServerUrlBepaler = ##class(APPS.common.Document.impl.DocBase.WebServerUrlDocBaseV7Bepaler).%New()
 	}
 	Else {
-		Set WebServerUrlBepaler = ##class(APPS.common.Document.impl.DocBase.WebServerUrlBepaler).%New("fop")
+		Do ##class(TECH.Exceptions.GeneralErrorException).Throw("Fout bij method 'GenereerProductDetailBlad' : de klasse 'APPS.common.Document.impl.DocBase.WebServerUrlBepaler' bestaat niet meer, want is tesamen met de FOP-server uitgefaseerd.")
+		;Set WebServerUrlBepaler = ##class(APPS.common.Document.impl.DocBase.WebServerUrlBepaler).%New("fop")
 	}
 	#dim BestandLocatie As %String = WebServerUrlBepaler.GeefLokaalPadOpIISServer(Bestand)
 	
@@ -278,7 +293,6 @@
 	}
 	
 	#dim BestandLocatieAlsUrl As %String = WebServerUrlBepaler.GeefUrl(Bestand)
-	Kill %WVActivateDocBaseV7
 	Quit BestandLocatieAlsUrl
 ]]></Implementation>
 </Method>