From 7b717a7e3849d722f0453324c5b5198f814fae03 Mon Sep 17 00:00:00 2001
From: Nastya <nastyab015@yandex.ru>
Date: Sat, 6 Dec 2025 09:30:01 +0300
Subject: [PATCH] fix bitrix

---
 CHANGELOG.md                                  |  1 +
 .../IntegrationsModal/Bitrix/BitrixLogin.tsx  | 20 +++++++++++++++++--
 .../Bitrix/PipelineSteps.tsx                  |  1 +
 .../IntegrationsModal/Bitrix/SwitchPages.tsx  |  4 ++--
 .../Bitrix/useBitrixIntegration.ts            |  3 +++
 .../IntegrationsModal/Bitrix/СhoosePerson.tsx |  3 +++
 6 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b89913fc..d7009078 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,4 @@
+1.0.16 _ 2025-12-06 _ bitrix
 1.0.15 _ 2025-12-03 _ Merge branch 'pin' into staging
 1.0.14 _ 2025-10-20 _ логика overtime для публички
 1.0.13 _ 2025-10-18 _ Визуал utm + логика
diff --git a/src/pages/IntegrationsPage/IntegrationsModal/Bitrix/BitrixLogin.tsx b/src/pages/IntegrationsPage/IntegrationsModal/Bitrix/BitrixLogin.tsx
index b4a411b2..87b99ab6 100644
--- a/src/pages/IntegrationsPage/IntegrationsModal/Bitrix/BitrixLogin.tsx
+++ b/src/pages/IntegrationsPage/IntegrationsModal/Bitrix/BitrixLogin.tsx
@@ -1,4 +1,4 @@
-import { Box, Typography, useMediaQuery, useTheme } from "@mui/material";
+import { Box, Button, Typography, useMediaQuery, useTheme } from "@mui/material";
 import { FC } from "react";
 import { AmoButton } from "../../../../components/AmoButton/AmoButton";
 import { connectBitrix } from "@/api/bitrixIntegration";
@@ -135,7 +135,23 @@ export const BitrixLogin: FC<IntegrationStep1Props> = ({ handleNextStep }) => {
         </Typography>
       </Box>
       <Box sx={{ marginTop: "50px" }}>
-        <AmoButton onClick={onAmoClick} />
+        <Button
+          onClick={onAmoClick}
+          sx={{
+            bgcolor: "#1bce7b",
+            width: "282px",
+            height: "46px",
+            color: "white",
+            fontWeight: 600,
+            fontSize: "16px",
+            "&:hover" : {
+              bgcolor: "#16aa65"
+            }
+          }}
+        >
+          Подключить
+        </Button>
+        {/* <AmoButton  /> */}
       </Box>
       {/*<StepButtonsBlock*/}
       {/*  isSmallBtnDisabled={true}*/}
diff --git a/src/pages/IntegrationsPage/IntegrationsModal/Bitrix/PipelineSteps.tsx b/src/pages/IntegrationsPage/IntegrationsModal/Bitrix/PipelineSteps.tsx
index f8a1ec7a..876f42cf 100644
--- a/src/pages/IntegrationsPage/IntegrationsModal/Bitrix/PipelineSteps.tsx
+++ b/src/pages/IntegrationsPage/IntegrationsModal/Bitrix/PipelineSteps.tsx
@@ -99,6 +99,7 @@ console.log(leadFlag)
           }}
         >
           <StepButtonsBlock
+          isLargeBtnDisabled={!Boolean(selectedStep)}
             onLargeBtnClick={handleNextStep}
             onSmallBtnClick={handlePrevStep}
           />
diff --git a/src/pages/IntegrationsPage/IntegrationsModal/Bitrix/SwitchPages.tsx b/src/pages/IntegrationsPage/IntegrationsModal/Bitrix/SwitchPages.tsx
index dff8c48d..c5150918 100644
--- a/src/pages/IntegrationsPage/IntegrationsModal/Bitrix/SwitchPages.tsx
+++ b/src/pages/IntegrationsPage/IntegrationsModal/Bitrix/SwitchPages.tsx
@@ -243,9 +243,9 @@ export const SwitchPages = ({
 
     selectedCurrentFields.forEach((data) => {
       if (data.entity === "contact") {
-        FieldsRule.contact.ContactRuleMap[data.id] = Number(data.bitrixId);
+        FieldsRule.contact.ContactRuleMap[data.id] = data.bitrixId;
       } else {
-        FieldsRule[data.entity].QuestionID[data.id] = Number(data.bitrixId) || 0;
+        FieldsRule[data.entity].QuestionID[data.id] = data.bitrixId || "";
       }
     });
 
diff --git a/src/pages/IntegrationsPage/IntegrationsModal/Bitrix/useBitrixIntegration.ts b/src/pages/IntegrationsPage/IntegrationsModal/Bitrix/useBitrixIntegration.ts
index 363b73b7..97035479 100644
--- a/src/pages/IntegrationsPage/IntegrationsModal/Bitrix/useBitrixIntegration.ts
+++ b/src/pages/IntegrationsPage/IntegrationsModal/Bitrix/useBitrixIntegration.ts
@@ -135,6 +135,9 @@ export const useBitrixIntegration = ({ isModalOpen, isTryRemoveAccount, quizID,
         if (settingsResponse.PipelineID) selectedPipelineHC(settingsResponse.PipelineID.toString());
         if (settingsResponse.StepID) setSelectedPipelineStep(settingsResponse.StepID.toString());
         if (settingsResponse.PerformerID) setSelectedDealPerformer(settingsResponse.PerformerID.toString());
+        console.log("settingsResponse")
+        console.log(settingsResponse)
+        setLeadFlag(settingsResponse.LeadFlag)
 
         if (Boolean(settingsResponse.FieldsRule) && Object.keys(settingsResponse?.FieldsRule).length > 0) {
           const gottenQuestions = { ...selectedQuestions };
diff --git a/src/pages/IntegrationsPage/IntegrationsModal/Bitrix/СhoosePerson.tsx b/src/pages/IntegrationsPage/IntegrationsModal/Bitrix/СhoosePerson.tsx
index 7ace7ebb..5d59d1b1 100644
--- a/src/pages/IntegrationsPage/IntegrationsModal/Bitrix/СhoosePerson.tsx
+++ b/src/pages/IntegrationsPage/IntegrationsModal/Bitrix/СhoosePerson.tsx
@@ -31,6 +31,9 @@ export const СhoosePerson: FC<Props> = ({
   const isMobile = useMediaQuery(theme.breakpoints.down(600));
   const isTablet = useMediaQuery(theme.breakpoints.down(1000));
 
+console.log("leadFlag")
+console.log(leadFlag)
+
   return (
     <>
       <Box