From 908e04675c2ca90a1df9ba6127e57cc959257dbc Mon Sep 17 00:00:00 2001
From: Chika <djchikalkin@gmail.com>
Date: Wed, 1 Jun 2022 15:18:29 +0300
Subject: [PATCH] =?UTF-8?q?3.=20=D0=B2=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5?=
 =?UTF-8?q?=D1=80=D0=BA=D0=B8=20=D0=BD=D0=B0=20=D0=BC=D0=B8=D0=BD.=D0=B8?=
 =?UTF-8?q?=20=D0=BC=D0=B0=D0=BA=D1=81.=D1=81=D1=82=D0=BE=D0=B8=D0=BC?=
 =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=8C=20=D0=BF=D1=80=D0=B8=20=D0=9F=D0=91?=
 =?UTF-8?q?=D0=9F=20=D1=82=D0=B0=D0=BA=D0=B6=D0=B5=20=D0=B4=D0=BE=D0=B1?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D1=82=D1=8C=20=D1=87=D1=82=D0=BE=20=D0=B8?=
 =?UTF-8?q?=D0=B7=20=D0=A1=D1=82=D0=BE=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D0=B8?=
 =?UTF-8?q?=20=D0=BD=D0=B0=D0=B4=D0=BE=20=D0=B2=D1=8B=D1=87=D0=B8=D1=82?=
 =?UTF-8?q?=D0=B0=D1=82=D1=8C=20=D1=81=D0=BA=D0=B8=D0=B4=D0=BA=D1=83=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B8=D0=B7=D0=B2=D0=BE=D0=B4=D0=B8=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BB=D1=8F,=20=D0=BD=D0=BE=20=D0=B4=D0=BE=D0=B1=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D1=8F=D1=82=D1=8C=20=D0=B4=D0=BE=D0=BF.=D0=BE?=
 =?UTF-8?q?=D0=B1=D0=BE=D1=80=D1=83=D0=B4=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20(=D0=B0=D0=BD=D0=B0=D0=BB=D0=BE=D0=B3=D0=B8=D1=87?=
 =?UTF-8?q?=D0=BD=D0=BE=20=D0=BA=D0=B0=D0=BA=20=D0=BF=D1=80=D0=B8=20=D1=80?=
 =?UTF-8?q?=D0=B0=D1=81=D1=87=D0=B5=D1=82=D0=B5=20=D0=BC=D0=B8=D0=BD.=20?=
 =?UTF-8?q?=D0=B8=20=D0=BC=D0=B0=D0=BA=D1=81.=D1=81=D1=82=D0=BE=D0=B8?=
 =?UTF-8?q?=D0=BC=D0=BE=D1=81=D1=82=D0=B8)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reactions/recalcWoRevisionReactions.ts        | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/client/stores/CalculationStore/Effects/reactions/recalcWoRevisionReactions.ts b/src/client/stores/CalculationStore/Effects/reactions/recalcWoRevisionReactions.ts
index 893a743..2eeb926 100644
--- a/src/client/stores/CalculationStore/Effects/reactions/recalcWoRevisionReactions.ts
+++ b/src/client/stores/CalculationStore/Effects/reactions/recalcWoRevisionReactions.ts
@@ -99,15 +99,22 @@ const reactionEffects: IReactionEffect[] = [
         supplierDiscountRub,
         leaseObjectPriceWthtVAT,
         recalcWithRevision,
+        addEquipmentPrice,
       } = calculationStore.values;
 
       //@ts-ignore
       const price = calculationStore.plPriceRub();
+
+      //@ts-ignore
+      const importProgramSum = calculationStore.importProgramSum();
+
       return [
         supplierDiscountRub,
         price,
         leaseObjectPriceWthtVAT,
         recalcWithRevision,
+        addEquipmentPrice,
+        importProgramSum,
       ];
     },
     effect: ([
@@ -115,6 +122,8 @@ const reactionEffects: IReactionEffect[] = [
       price,
       leaseObjectPriceWthtVAT,
       recalcWithRevision,
+      addEquipmentPrice,
+      importProgramSum,
     ]) => {
       if (!recalcWithRevision) {
         calculationStore.setValidation('tbxLeaseObjectPrice', undefined);
@@ -128,7 +137,8 @@ const reactionEffects: IReactionEffect[] = [
       const maxCondition1 =
         quote?.evo_max_price_change &&
         !product?.evo_sale_without_nds &&
-        price - supplierDiscountRub > quote.evo_max_price_change;
+        price - supplierDiscountRub + addEquipmentPrice - importProgramSum >
+          quote.evo_max_price_change;
 
       const maxCondition2 =
         quote?.evo_max_price_change &&
@@ -140,7 +150,8 @@ const reactionEffects: IReactionEffect[] = [
       const minCondition1 =
         quote?.evo_min_change_price &&
         !product?.evo_sale_without_nds &&
-        price - supplierDiscountRub < quote.evo_min_change_price;
+        price - supplierDiscountRub + addEquipmentPrice - importProgramSum <
+          quote.evo_min_change_price;
 
       const minCondition2 =
         quote?.evo_min_change_price &&