diff --git a/src/client/stores/CalculationStore/Effects/reactions/otherReactions.ts b/src/client/stores/CalculationStore/Effects/reactions/otherReactions.ts index ef86699..c66d32f 100644 --- a/src/client/stores/CalculationStore/Effects/reactions/otherReactions.ts +++ b/src/client/stores/CalculationStore/Effects/reactions/otherReactions.ts @@ -833,20 +833,18 @@ const reactionEffects: IReactionEffect[] = [ const plPriceRub = calculationStore.plPriceRub(); //@ts-ignore const discountRub = calculationStore.discountRub(); + //@ts-ignore + const importProgramSum: number = calculationStore.importProgramSum(); - const { - leasingPeriod, - leaseObjectType, - addEquipmentPrice, - importProgram, - } = calculationStore.values; + const { leasingPeriod, leaseObjectType, addEquipmentPrice } = + calculationStore.values; return { leasingPeriod, leaseObjectType, plPriceRub, discountRub, addEquipmentPrice, - importProgram, + importProgramSum, }; }, effect: ({ @@ -855,7 +853,7 @@ const reactionEffects: IReactionEffect[] = [ plPriceRub = 0, discountRub = 0, addEquipmentPrice = 0, - importProgram = 0, + importProgramSum = 0, }) => { calculationStore.setFilter('selectLeasingWithoutKasko', options => options.filter( @@ -867,9 +865,9 @@ const reactionEffects: IReactionEffect[] = [ x?.evo_max_price && x?.evo_min_price && x.evo_max_price >= - plPriceRub - discountRub - importProgram + addEquipmentPrice && + plPriceRub - discountRub - importProgramSum + addEquipmentPrice && x.evo_min_price <= - plPriceRub - discountRub - importProgram + addEquipmentPrice && + plPriceRub - discountRub - importProgramSum + addEquipmentPrice && x.evo_leasingobject_types?.find( x => x.evo_leasingobject_typeid === leaseObjectType, ) &&