fix bitrix

This commit is contained in:
Nastya 2025-12-06 09:30:01 +03:00
parent 4997179b75
commit 7b717a7e38
6 changed files with 28 additions and 4 deletions

@ -1,3 +1,4 @@
1.0.16 _ 2025-12-06 _ bitrix
1.0.15 _ 2025-12-03 _ Merge branch 'pin' into staging 1.0.15 _ 2025-12-03 _ Merge branch 'pin' into staging
1.0.14 _ 2025-10-20 _ логика overtime для публички 1.0.14 _ 2025-10-20 _ логика overtime для публички
1.0.13 _ 2025-10-18 _ Визуал utm + логика 1.0.13 _ 2025-10-18 _ Визуал utm + логика

@ -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 { FC } from "react";
import { AmoButton } from "../../../../components/AmoButton/AmoButton"; import { AmoButton } from "../../../../components/AmoButton/AmoButton";
import { connectBitrix } from "@/api/bitrixIntegration"; import { connectBitrix } from "@/api/bitrixIntegration";
@ -135,7 +135,23 @@ export const BitrixLogin: FC<IntegrationStep1Props> = ({ handleNextStep }) => {
</Typography> </Typography>
</Box> </Box>
<Box sx={{ marginTop: "50px" }}> <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> </Box>
{/*<StepButtonsBlock*/} {/*<StepButtonsBlock*/}
{/* isSmallBtnDisabled={true}*/} {/* isSmallBtnDisabled={true}*/}

@ -99,6 +99,7 @@ console.log(leadFlag)
}} }}
> >
<StepButtonsBlock <StepButtonsBlock
isLargeBtnDisabled={!Boolean(selectedStep)}
onLargeBtnClick={handleNextStep} onLargeBtnClick={handleNextStep}
onSmallBtnClick={handlePrevStep} onSmallBtnClick={handlePrevStep}
/> />

@ -243,9 +243,9 @@ export const SwitchPages = ({
selectedCurrentFields.forEach((data) => { selectedCurrentFields.forEach((data) => {
if (data.entity === "contact") { if (data.entity === "contact") {
FieldsRule.contact.ContactRuleMap[data.id] = Number(data.bitrixId); FieldsRule.contact.ContactRuleMap[data.id] = data.bitrixId;
} else { } else {
FieldsRule[data.entity].QuestionID[data.id] = Number(data.bitrixId) || 0; FieldsRule[data.entity].QuestionID[data.id] = data.bitrixId || "";
} }
}); });

@ -135,6 +135,9 @@ export const useBitrixIntegration = ({ isModalOpen, isTryRemoveAccount, quizID,
if (settingsResponse.PipelineID) selectedPipelineHC(settingsResponse.PipelineID.toString()); if (settingsResponse.PipelineID) selectedPipelineHC(settingsResponse.PipelineID.toString());
if (settingsResponse.StepID) setSelectedPipelineStep(settingsResponse.StepID.toString()); if (settingsResponse.StepID) setSelectedPipelineStep(settingsResponse.StepID.toString());
if (settingsResponse.PerformerID) setSelectedDealPerformer(settingsResponse.PerformerID.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) { if (Boolean(settingsResponse.FieldsRule) && Object.keys(settingsResponse?.FieldsRule).length > 0) {
const gottenQuestions = { ...selectedQuestions }; const gottenQuestions = { ...selectedQuestions };

@ -31,6 +31,9 @@ export const СhoosePerson: FC<Props> = ({
const isMobile = useMediaQuery(theme.breakpoints.down(600)); const isMobile = useMediaQuery(theme.breakpoints.down(600));
const isTablet = useMediaQuery(theme.breakpoints.down(1000)); const isTablet = useMediaQuery(theme.breakpoints.down(1000));
console.log("leadFlag")
console.log(leadFlag)
return ( return (
<> <>
<Box <Box