Index: APPS/VKP/Korting/impl/KortingService.cls.xml =================================================================== diff -u -r67158 -r67160 --- APPS/VKP/Korting/impl/KortingService.cls.xml (.../KortingService.cls.xml) (revision 67158) +++ APPS/VKP/Korting/impl/KortingService.cls.xml (.../KortingService.cls.xml) (revision 67160) @@ -59,15 +59,15 @@ #dim Index As %Integer #dim KortingConfiguratieArray As Array Of APPS.VKP.dto.KortingConfiguratie = ##class(%ArrayOfObjects).%New() - #dim EnuVariant As DOM.PM.enu.Variant + #dim EnuVariant As DOM.PM.enu.Variant While KortingenVoorKlantIterator.HasNext() { - #dim Reduction As %Numeric = KortingenVoorKlantIterator.Next() - #dim KortingPercentage As TECH.Percentage = ..GeefKortingPercentage(Reduction) + #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 = $LI(Varianten, Index) + Set EnuVariant = $List(Varianten, Index) Do KortingConfiguratieArray.SetAt(..GeefKortingConfiguratie(KlantID, EnuVariant, KortingPercentage, PersonalityID), EnuVariant) } } Else { @@ -87,16 +87,16 @@ #dim Varianten As %List If (PersonalityID = ##class(DOM.common.enu.Personality).HaefeleBE()) { - Set Varianten = $LB(##class(DOM.PM.enu.Variant).TandemboxIntivo(), ##class(DOM.PM.enu.Variant).TandemboxAntaro(), ##class(DOM.PM.enu.Variant).TandemboxPlus()) + Set Varianten = $ListBuild(##class(DOM.PM.enu.Variant).TandemboxIntivo(), ##class(DOM.PM.enu.Variant).TandemboxAntaro(), ##class(DOM.PM.enu.Variant).TandemboxPlus()) } Else { - Set Varianten = $LB(##class(DOM.PM.enu.Variant).TandemboxAntaro()) + 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 _ $LB(##class(DOM.PM.enu.Variant).LegraboxPure()) _ $LB(##class(DOM.PM.enu.Variant).Taorbox()) + Set Varianten = Varianten _ $ListBuild(##class(DOM.PM.enu.Variant).LegraboxPure()) _ $ListBuild(##class(DOM.PM.enu.Variant).Taorbox()) } Quit Varianten @@ -119,10 +119,10 @@ -Reduction:%Numeric +KortingFactor:%Numeric 1 TECH.Percentage -