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>