Index: vhTest/Mock/APPS/VKP/Korting/impl/KortingService/KortingServiceHelper.cls.xml
===================================================================
diff -u -r67162 -r67196
--- vhTest/Mock/APPS/VKP/Korting/impl/KortingService/KortingServiceHelper.cls.xml	(.../KortingServiceHelper.cls.xml)	(revision 67162)
+++ vhTest/Mock/APPS/VKP/Korting/impl/KortingService/KortingServiceHelper.cls.xml	(.../KortingServiceHelper.cls.xml)	(revision 67196)
@@ -15,13 +15,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefKortingConfiguratieArray">
-<FormalSpec>KortingenVoorKlantIterator:TECH.Iterator,KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality</FormalSpec>
-<ReturnType>%ArrayOfObjects</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefKortingConfiguratieArray",KortingenVoorKlantIterator,KlantID,PersonalityID)
-]]></Implementation>
-</Method>
-
 <Method name="GeefKortingPercentage">
 <FormalSpec>KortingFactor:%Numeric</FormalSpec>
 <ReturnType>TECH.Percentage</ReturnType>
@@ -45,9 +38,17 @@
 
 <Method name="GeefVariantenVoorPersonality">
 <FormalSpec>PersonalityID:DOM.common.enu.Personality</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("GeefVariantenVoorPersonality",PersonalityID)
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefVariantenVoorPersonality",PersonalityID)
 ]]></Implementation>
 </Method>
+
+<Method name="IsNietBEHaefelePersonality">
+<FormalSpec>PersonalityID:DOM.common.enu.Personality</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("IsNietBEHaefelePersonality",PersonalityID)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Fake/APPS/VKP/Korting/impl/KortingService/KortingServiceHelper.cls.xml
===================================================================
diff -u -r67162 -r67196
--- vhTest/Fake/APPS/VKP/Korting/impl/KortingService/KortingServiceHelper.cls.xml	(.../KortingServiceHelper.cls.xml)	(revision 67162)
+++ vhTest/Fake/APPS/VKP/Korting/impl/KortingService/KortingServiceHelper.cls.xml	(.../KortingServiceHelper.cls.xml)	(revision 67196)
@@ -15,12 +15,23 @@
 </Method>
 
 <Method name="GeefKortingConfiguratieArray">
-<FormalSpec>KortingenVoorKlantIterator:TECH.Iterator,KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality</FormalSpec>
+<FormalSpec>Customer:APPS.VKP.Korting.xml.Customer,KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality</FormalSpec>
 <ReturnType>%ArrayOfObjects</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
 
+<Method name="IsNietBEHaefelePersonality">
+<FormalSpec>PersonalityID:DOM.common.enu.Personality</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="IsHaefelePersonality">
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="GeefKortingPercentage">
 <FormalSpec>KortingFactor:%Numeric</FormalSpec>
 <ReturnType>TECH.Percentage</ReturnType>
@@ -44,8 +55,8 @@
 
 <Method name="GeefVariantenVoorPersonality">
 <FormalSpec>PersonalityID:DOM.common.enu.Personality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
 
Index: APPS/VKP/Korting/impl/KortingService/KortingServiceHelper.cls.xml
===================================================================
diff -u -r67162 -r67196
--- APPS/VKP/Korting/impl/KortingService/KortingServiceHelper.cls.xml	(.../KortingServiceHelper.cls.xml)	(revision 67162)
+++ APPS/VKP/Korting/impl/KortingService/KortingServiceHelper.cls.xml	(.../KortingServiceHelper.cls.xml)	(revision 67196)
@@ -3,37 +3,9 @@
 <Class name="APPS.VKP.Korting.impl.KortingService.KortingServiceHelper">
 <Super>TECH.RegisteredObject,TECH.Mockable</Super>
 
-<Method name="GeefKortingConfiguratieArray">
-<FormalSpec>KortingenVoorKlantIterator:TECH.Iterator,KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality</FormalSpec>
-<ReturnType>%ArrayOfObjects</ReturnType>
-<Implementation><![CDATA[
-	#dim Varianten As %List = ..GeefVariantenVoorPersonality(PersonalityID)
-	#dim Index As %Integer
-
-	#dim KortingConfiguratieArray As Array Of APPS.VKP.dto.KortingConfiguratie = ##class(%ArrayOfObjects).%New()
-	#dim EnuVariant As DOM.PM.enu.Variant
-	While KortingenVoorKlantIterator.HasNext()
-	{
-		#dim KortingFactor As %Numeric = KortingenVoorKlantIterator.Next()
-		#dim KortingPercentage As TECH.Percentage = ..GeefKortingPercentage(KortingFactor)
-		#dim Variant As %String = KortingenVoorKlantIterator.Key()
-		If (Variant = "TBX") {
-			For Index = 1 : 1 : $ListLength(Varianten) {
-				Set EnuVariant = $List(Varianten, Index)
-				Do KortingConfiguratieArray.SetAt(..GeefKortingConfiguratie(KlantID, EnuVariant, KortingPercentage, PersonalityID), EnuVariant)
-			}
-		} Else {
-			Set EnuVariant = ..GeefVariant(Variant)
-			Do KortingConfiguratieArray.SetAt(..GeefKortingConfiguratie(KlantID, EnuVariant, KortingPercentage, PersonalityID), EnuVariant)
-		}
-	}
-	
-	Quit KortingConfiguratieArray
-]]></Implementation>
-</Method>
-
 <Method name="GeefVariantenVoorPersonality">
 <FormalSpec>PersonalityID:DOM.common.enu.Personality</FormalSpec>
+<ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[
 	#dim Varianten As %List
 	
@@ -44,8 +16,7 @@
 		Set Varianten = $ListBuild(##class(DOM.PM.enu.Variant).TandemboxAntaro())
 	}
 	
-	Set Personality = ##class(DOM.common.enu.Personality.AutoComplete).%New()
-	#dim KopieerKortingVanTbxNaarAndereTypes As %Boolean = ((PersonalityID = Personality.HaefeleNL)||(PersonalityID = Personality.HaefeleDE)||(PersonalityID = Personality.HaefeleSE)||(PersonalityID = Personality.HaefeleFI)||(PersonalityID =Personality.HaefeleFR)||(PersonalityID =Personality.HaefeleDK)||(PersonalityID =Personality.HaefeleIT)||(PersonalityID =Personality.HaefeleAT)||(PersonalityID =Personality.HaefeleCH))
+	#dim KopieerKortingVanTbxNaarAndereTypes As %Boolean = ..IsNietBEHaefelePersonality(PersonalityID)
 	If KopieerKortingVanTbxNaarAndereTypes {
 		Set Varianten = Varianten _ $ListBuild(##class(DOM.PM.enu.Variant).LegraboxPure()) _ $ListBuild(##class(DOM.PM.enu.Variant).Taorbox())
 	}
@@ -103,6 +74,23 @@
 <Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(Customer.Reduction)
 ]]></Implementation>
 </Method>
+
+<Method name="IsNietBEHaefelePersonality">
+<FormalSpec>PersonalityID:DOM.common.enu.Personality</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set Personality = ##class(DOM.common.enu.Personality.AutoComplete).%New()
+	Quit ((PersonalityID = Personality.HaefeleNL)
+		||(PersonalityID = Personality.HaefeleDE)
+		||(PersonalityID = Personality.HaefeleSE)
+		||(PersonalityID = Personality.HaefeleFI)
+		||(PersonalityID = Personality.HaefeleFR)
+		||(PersonalityID = Personality.HaefeleDK)
+		||(PersonalityID = Personality.HaefeleIT)
+		||(PersonalityID = Personality.HaefeleAT)
+		||(PersonalityID = Personality.HaefeleCH))
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Fake/APPS/VKP/Korting/impl/KortingService.cls.xml
===================================================================
diff -u -r63827 -r67196
--- vhTest/Fake/APPS/VKP/Korting/impl/KortingService.cls.xml	(.../KortingService.cls.xml)	(revision 63827)
+++ vhTest/Fake/APPS/VKP/Korting/impl/KortingService.cls.xml	(.../KortingService.cls.xml)	(revision 67196)
@@ -14,6 +14,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefKortingConfiguratieArray">
+<FormalSpec>Customer:APPS.VKP.Korting.xml.Customer,KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality</FormalSpec>
+<ReturnType>%ArrayOfObjects</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="Parse">
 <FormalSpec>BestandNaam:%String,PersonalityID:DOM.common.enu.Personality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: APPS/VKP/Korting/impl/KortingService.cls.xml
===================================================================
diff -u -r67164 -r67196
--- APPS/VKP/Korting/impl/KortingService.cls.xml	(.../KortingService.cls.xml)	(revision 67164)
+++ APPS/VKP/Korting/impl/KortingService.cls.xml	(.../KortingService.cls.xml)	(revision 67196)
@@ -48,13 +48,44 @@
 <Implementation><![CDATA[
 	#dim Personality As DOM.common.Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(PersonalityID)
 	#dim KlantID As DOM.VKP.VanHoeckeKlantID = Personality.GeefPrefix()_Customer.id
-
-	#dim KortingenVoorKlantIterator As TECH.ListIterator = ..KortingServiceHelper.GeefKortingenVoorKlantIterator(Customer)
-	#dim KortingConfiguratieArray As Array Of APPS.VKP.dto.KortingConfiguratie = ..KortingServiceHelper.GeefKortingConfiguratieArray(KortingenVoorKlantIterator, KlantID, PersonalityID)
 	
+	#dim KortingConfiguratieArray As Array Of APPS.VKP.dto.KortingConfiguratie = ..GeefKortingConfiguratieArray(Customer, KlantID, PersonalityID)
+	
 	Quit ##class(TECH.ListUtils).ArrayOfObjectsToValueList(KortingConfiguratieArray)
 ]]></Implementation>
 </Method>
+
+<Method name="GeefKortingConfiguratieArray">
+<FormalSpec>Customer:APPS.VKP.Korting.xml.Customer,KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality</FormalSpec>
+<Private>1</Private>
+<ReturnType>%ArrayOfObjects</ReturnType>
+<Implementation><![CDATA[
+	#dim Varianten As %List = ..KortingServiceHelper.GeefVariantenVoorPersonality(PersonalityID)
+	#dim KortingConfiguratieArray As Array Of APPS.VKP.dto.KortingConfiguratie = ##class(%ArrayOfObjects).%New()
+	
+	#dim KortingenVoorKlantIterator As TECH.Iterator = ..KortingServiceHelper.GeefKortingenVoorKlantIterator(Customer)
+	#dim EnuVariant As DOM.PM.enu.Variant
+	#dim Index As %Integer
+	While KortingenVoorKlantIterator.HasNext()
+	{
+		#dim KortingFactor As %Numeric = KortingenVoorKlantIterator.Next()
+		#dim KortingPercentage As TECH.Percentage = KortingFactor / 100
+		#dim Variant As %String = KortingenVoorKlantIterator.Key()
+		
+		If (Variant = "TBX") {
+			For Index = 1 : 1 : $ListLength(Varianten) {
+				Set EnuVariant = $List(Varianten, Index)
+				Do KortingConfiguratieArray.SetAt(..KortingServiceHelper.GeefKortingConfiguratie(KlantID, EnuVariant, KortingPercentage, PersonalityID), EnuVariant)
+			}
+		} Else {
+			Set EnuVariant = ..KortingServiceHelper.GeefVariant(Variant)
+			Do KortingConfiguratieArray.SetAt(..KortingServiceHelper.GeefKortingConfiguratie(KlantID, EnuVariant, KortingPercentage, PersonalityID), EnuVariant)
+		}
+	}
+	
+	Quit KortingConfiguratieArray
+]]></Implementation>
+</Method>
 </Class>