Index: APPS/VKP/Korting/impl/KortingService.cls.xml
===================================================================
diff -u -r67160 -r67161
--- APPS/VKP/Korting/impl/KortingService.cls.xml	(.../KortingService.cls.xml)	(revision 67160)
+++ APPS/VKP/Korting/impl/KortingService.cls.xml	(.../KortingService.cls.xml)	(revision 67161)
@@ -13,15 +13,21 @@
 <Private>1</Private>
 </Property>
 
+<Property name="KortingServiceHelper">
+<Type>APPS.VKP.Korting.impl.KortingService.KortingServiceHelper</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>KortingParser:APPS.VKP.Korting.KortingParser,KortingVerwijderaar:APPS.VKP.Korting.impl.KortingVerwijderaar</FormalSpec>
+<FormalSpec>KortingParser:APPS.VKP.Korting.KortingParser,KortingVerwijderaar:APPS.VKP.Korting.impl.KortingVerwijderaar,KortingServiceHelper:APPS.VKP.Korting.impl.KortingService.KortingServiceHelper</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..KortingParser = $$$Inject(KortingParser, ##class(APPS.VKP.Klantspecifiek.Haefele.KortingParser).%New(%this))
 	Set ..KortingVerwijderaar = $$$Implementation(KortingVerwijderaar,##class(APPS.VKP.Korting.impl.KortingVerwijderaar).%New())
+	Set ..KortingServiceHelper = $$$Inject(KortingServiceHelper, ##class(APPS.VKP.Korting.impl.KortingService.KortingServiceHelper).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -43,7 +49,7 @@
 	#dim Personality As DOM.common.Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(PersonalityID)
 	#dim KlantID As DOM.VKP.VanHoeckeKlantID = Personality.GeefPrefix()_Customer.id
 
-	Set KortingenVoorKlantIterator = ##class(TECH.ListIterator).%New(Customer.Reduction)
+	#dim KortingenVoorKlantIterator As TECH.ListIterator = ..KortingServiceHelper.GeefKortingenVoorKlantIterator(Customer)
 	#dim KortingConfiguratieArray As Array Of APPS.VKP.dto.KortingConfiguratie = ..GeefKortingConfiguratieArray(KortingenVoorKlantIterator, KlantID, PersonalityID)
 	
 	Quit ##class(TECH.ListUtils).ArrayOfObjectsToValueList(KortingConfiguratieArray)
@@ -55,99 +61,30 @@
 <Private>1</Private>
 <ReturnType>%ArrayOfObjects</ReturnType>
 <Implementation><![CDATA[
-	#dim Varianten As %List = ..GeefVarianten(PersonalityID)
+	#dim Varianten As %List = ..KortingServiceHelper.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 KortingPercentage As TECH.Percentage = ..KortingServiceHelper.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)
+				Do KortingConfiguratieArray.SetAt(..KortingServiceHelper.GeefKortingConfiguratie(KlantID, EnuVariant, KortingPercentage, PersonalityID), EnuVariant)
 			}
 		} Else {
-			Set EnuVariant = ..GeefVariant(Variant)
-			Do KortingConfiguratieArray.SetAt(..GeefKortingConfiguratie(KlantID, EnuVariant, KortingPercentage, PersonalityID), EnuVariant)
+			Set EnuVariant = ..KortingServiceHelper.GeefVariant(Variant)
+			Do KortingConfiguratieArray.SetAt(..KortingServiceHelper.GeefKortingConfiguratie(KlantID, EnuVariant, KortingPercentage, PersonalityID), EnuVariant)
 		}
 	}
 	
 	Quit KortingConfiguratieArray
 ]]></Implementation>
 </Method>
-
-<Method name="GeefVarianten">
-<FormalSpec>PersonalityID:DOM.common.enu.Personality</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	#dim Varianten As %List
-	
-	If (PersonalityID = ##class(DOM.common.enu.Personality).HaefeleBE()) {
-		Set Varianten = $ListBuild(##class(DOM.PM.enu.Variant).TandemboxIntivo(), ##class(DOM.PM.enu.Variant).TandemboxAntaro(), ##class(DOM.PM.enu.Variant).TandemboxPlus())
-	}
-	Else {
-		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))
-	If KopieerKortingVanTbxNaarAndereTypes {
-		Set Varianten = Varianten _ $ListBuild(##class(DOM.PM.enu.Variant).LegraboxPure()) _ $ListBuild(##class(DOM.PM.enu.Variant).Taorbox())
-	}
-	
-	Quit Varianten
-]]></Implementation>
-</Method>
-
-<Method name="GeefKortingConfiguratie">
-<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,Variant:DOM.PM.enu.Variant,KortingPercentage:TECH.Percentage,PersonalityID:DOM.common.enu.Personality</FormalSpec>
-<Private>1</Private>
-<ReturnType>APPS.VKP.dto.KortingConfiguratie</ReturnType>
-<Implementation><![CDATA[
-	Set KortingConfiguratie = ##class(APPS.VKP.dto.KortingConfiguratie).%New()
-	Set KortingConfiguratie.PersonalityID = PersonalityID
-	Set KortingConfiguratie.KlantID = KlantID
-	Set KortingConfiguratie.KortingPercentage = KortingPercentage
-	Set KortingConfiguratie.Familie = ##class(DOM.PM.enu.Familie).Lade()
-	Set KortingConfiguratie.Variant = Variant
-	Quit KortingConfiguratie
-]]></Implementation>
-</Method>
-
-<Method name="GeefKortingPercentage">
-<FormalSpec>KortingFactor:%Numeric</FormalSpec>
-<Private>1</Private>
-<ReturnType>TECH.Percentage</ReturnType>
-<Implementation><![CDATA[	Quit (KortingFactor/100)
-]]></Implementation>
-</Method>
-
-<Method name="GeefVariant">
-<FormalSpec>Variant:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>DOM.PM.enu.Variant</ReturnType>
-<Implementation><![CDATA[
-	#dim enuVariant As DOM.PM.enu.Variant
-	If Variant = "TBX_INTIVO" {
-		Set enuVariant = ##class(DOM.PM.enu.Variant).TandemboxIntivo()	
-	}ElseIf Variant = "TBX_ANTARO" {
-		Set enuVariant = ##class(DOM.PM.enu.Variant).TandemboxAntaro()	
-	}ElseIf Variant = "TBX_PLUS" {
-		Set enuVariant = ##class(DOM.PM.enu.Variant).TandemboxPlus()	
-	}ElseIf Variant = "LBX" {
-		Set enuVariant = ##class(DOM.PM.enu.Variant).LegraboxPure()	
-	}ElseIf (Variant = "TAX"){
-		Set enuVariant = ##class(DOM.PM.enu.Variant).Taorbox()	
-	}Else{
-		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Variant '"_Variant_"' is niet ondersteund voor kortingen."))
-	}
-	Quit enuVariant
-]]></Implementation>
-</Method>
 </Class>