From a747af733313e6062daee84fe3636e312f719fd5 Mon Sep 17 00:00:00 2001
From: vchikalkin <djchikalkin@gmail.com>
Date: Wed, 5 Apr 2023 15:06:06 +0300
Subject: [PATCH] =?UTF-8?q?comission:=20=D0=B4=D0=BE=D0=BF=D0=BE=D0=BB?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=BB=D0=B8=20=D1=84=D0=BE=D1=80=D0=BC=D1=83=D0=BB?=
 =?UTF-8?q?=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web/process/price/reactions/common.ts | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/web/process/price/reactions/common.ts b/apps/web/process/price/reactions/common.ts
index a7c53a4..9e46eb0 100644
--- a/apps/web/process/price/reactions/common.ts
+++ b/apps/web/process/price/reactions/common.ts
@@ -128,9 +128,15 @@ export default function reactions({ store, apolloClient }: ProcessContext) {
   );
 
   reaction(
-    () => $calculation.$values.getValues(['comissionPerc', 'plPriceRub']),
-    ({ plPriceRub, comissionPerc }) => {
-      const rub = (comissionPerc * plPriceRub) / 100;
+    () =>
+      $calculation.$values.getValues([
+        'comissionPerc',
+        'plPriceRub',
+        'addEquipmentPrice',
+        'importProgramSum',
+      ]),
+    ({ plPriceRub, comissionPerc, addEquipmentPrice, importProgramSum }) => {
+      const rub = (comissionPerc * (plPriceRub + addEquipmentPrice - importProgramSum)) / 100;
       $calculation.element('tbxComissionRub').setValue(rub);
     }
   );
@@ -140,8 +146,9 @@ export default function reactions({ store, apolloClient }: ProcessContext) {
       reaction(
         () => $calculation.element('tbxComissionRub').getValue(),
         (comissionRub) => {
-          const { plPriceRub } = $calculation.$values.getValues();
-          const perc = (comissionRub / plPriceRub) * 100;
+          const { plPriceRub, addEquipmentPrice, importProgramSum } =
+            $calculation.$values.getValues();
+          const perc = (comissionRub / (plPriceRub + addEquipmentPrice - importProgramSum)) * 100;
           $calculation.element('tbxComissionPerc').setValue(perc);
         }
       ),