From 92eb52d47d7c5a2d998c6a3ba66c889944dbc8c0 Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Fri, 23 Sep 2022 17:09:11 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20=D1=80=D0=B5=D0=B0=D0=BA=D1=86=D0=B8?= =?UTF-8?q?=D0=B8=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D0=B8=20selectLeasingWithoutKasko?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Effects/reactions/otherReactions.ts | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) 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, ) &&