merge branch 'release/dyn-4885'

This reverts commit 0eccd799c79840fe8aa93461880b6ae61a217857.

apps/api/Dockerfile

@@ -2,14 +2,14 @@
 # Make sure you update both files!
 
 FROM node:alpine AS builder
-RUN corepack enable && corepack prepare pnpm@latest --activate
+RUN corepack enable && corepack prepare pnpm@8.9.0 --activate
 ENV PNPM_HOME=/usr/local/bin
 # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
 RUN apk add --no-cache libc6-compat
 RUN apk update
 # Set working directory
 WORKDIR /app
-RUN pnpm add -g turbo dotenv-cli
+RUN pnpm add -g turbo@1.12.4 dotenv-cli
 COPY . .
 RUN turbo prune --scope=api --docker
 

apps/api/src/proxy/lib/config.ts

@@ -14,6 +14,7 @@ export const queryTTL: Record<string, number | false> = {
   GetDealerPerson: seconds().fromHours(1),
   GetDealerPersons: seconds().fromHours(1),
   GetDealers: seconds().fromMinutes(15),
+  GetEltInsuranceRules: seconds().fromHours(12),
   GetFuelCards: seconds().fromHours(12),
   GetGPSBrands: seconds().fromHours(24),
   GetGPSModels: seconds().fromHours(24),
@@ -32,6 +33,7 @@ export const queryTTL: Record<string, number | false> = {
   GetOpportunities: false,
   GetOpportunity: false,
   GetOpportunityUrl: seconds().fromHours(12),
+  GetOsagoAddproductTypes: seconds().fromHours(12),
   GetProduct: seconds().fromHours(12),
   GetProducts: seconds().fromHours(12),
   GetQuote: false,

apps/web/@types/errors.ts

@@ -0,0 +1,19 @@
+import elementsToValues from '@/Components/Calculation/config/map/values';
+
+export const ERR_ELT_KASKO = 'ERR_ELT_KASKO';
+export const ERR_ELT_OSAGO = 'ERR_ELT_OSAGO';
+export const ERR_FINGAP_TABLE = 'ERR_FINGAP_TABLE';
+export const ERR_INSURANCE_TABLE = 'ERR_INSURANCE_TABLE';
+export const ERR_PAYMENTS_TABLE = 'ERR_PAYMENTS_TABLE';
+
+export const ERROR_TABLE_KEYS = [
+  ERR_ELT_KASKO,
+  ERR_ELT_OSAGO,
+  ERR_FINGAP_TABLE,
+  ERR_INSURANCE_TABLE,
+  ERR_PAYMENTS_TABLE,
+];
+
+export const ERROR_ELEMENTS_KEYS = Object.keys(elementsToValues);
+
+export const ERROR_KEYS = [...ERROR_ELEMENTS_KEYS, ...ERROR_TABLE_KEYS];

apps/web/Components/Admin/Cache/index.tsx

@@ -1,9 +1,10 @@
 import Background from '../../Layout/Background';
 import { useFilteredQueries } from './lib/hooks';
 import { QueryList } from './QueryList';
+import { reset } from '@/api/cache/query';
 import { min } from '@/styles/mq';
 import styled from 'styled-components';
-import { Collapse, Divider, Input } from 'ui/elements';
+import { Button, Collapse, Divider, Input } from 'ui/elements';
 
 const Wrapper = styled(Background)`
   padding: 4px 6px;
@@ -21,13 +22,21 @@ const Wrapper = styled(Background)`
 
 const Flex = styled.div`
   display: flex;
-  margin-bottom: 16px;
+  flex-direction: column;
-  justify-content: space-between;
   gap: 10px;
 `;
 
+const ButtonWrapper = styled.div`
+  display: flex;
+  justify-content: flex-end;
+`;
+
 export function Cache() {
-  const { filteredQueries, setFilterString } = useFilteredQueries();
+  const { filteredQueries, refetch, setFilterString } = useFilteredQueries();
+
+  function handleDeleteQuery() {
+    return reset().then(() => refetch());
+  }
 
   if (!filteredQueries) {
     return <div>Загрузка...</div>;
@@ -42,7 +51,6 @@ export function Cache() {
           allowClear
           onChange={(e) => setFilterString(e.target.value)}
         />
-      </Flex>
         <Collapse
           accordion
           items={Object.keys(filteredQueries).map((queryGroupName) => ({
@@ -51,6 +59,12 @@ export function Cache() {
             label: queryGroupName,
           }))}
         />
+        <ButtonWrapper>
+          <Button type="primary" danger disabled={false} onClick={() => handleDeleteQuery()}>
+            Очистить кэш
+          </Button>
+        </ButtonWrapper>
+      </Flex>
     </Wrapper>
   );
 }

apps/web/Components/Calculation/Form/AddProduct/config.ts

@@ -7,7 +7,7 @@ export const rows: FormTabRows = [
   {
     title: 'Регистрация',
   },
-  [['radioObjectRegistration', 'radioTypePTS'], { gridTemplateColumns: ['1fr 1fr'] }],
+  [['radioObjectRegistration', 'radioTypePTS'], { gridTemplateColumns: ['1fr', '1fr 1fr'] }],
   [['selectRegionRegistration', 'selectTownRegistration', 'selectObjectRegionRegistration']],
   [['selectObjectCategoryTax', 'selectObjectTypeTax', 'tbxVehicleTaxInYear']],
   [['tbxLeaseObjectYear', 'tbxLeaseObjectMotorPower', 'tbxVehicleTaxInLeasingPeriod']],

apps/web/Components/Calculation/Form/CreateKP/config.ts

@@ -12,5 +12,6 @@ export const rows: FormTabRows = [
   [['cbxInsurance', 'cbxRegistrationQuote'], { gridTemplateColumns: ['1fr', '1fr 1fr'] }],
   [['cbxTechnicalCardQuote', 'cbxNSIB'], { gridTemplateColumns: ['1fr', '1fr 1fr'] }],
   [['cbxQuoteRedemptionGraph', 'cbxShowFinGAP'], { gridTemplateColumns: ['1fr', '1fr 1fr'] }],
+  [['cbxQuoteShowAcceptLimit'], { gridTemplateColumns: ['1fr', '1fr 1fr'] }],
   [['tbxQuoteName', 'radioQuoteContactGender'], { gridTemplateColumns: ['1fr', '2fr 1fr'] }],
 ];

apps/web/Components/Calculation/Form/ELT/Kasko.tsx

@@ -1,129 +1,41 @@
 /* eslint-disable sonarjs/cognitive-complexity */
 import { PolicyTable, ReloadButton, Validation } from './Components';
 import { columns } from './lib/config';
-import { makeEltKaskoRequest } from './lib/make-request';
+import { resetRow } from './lib/tools';
 import type { Row, StoreSelector } from './types';
-import { getEltKasko } from '@/api/elt/query';
-import { MAX_FRANCHISE, MAX_INSURANCE, MIN_INSURANCE } from '@/constants/values';
-import helper from '@/process/elt/lib/helper';
 import { useStore } from '@/stores/hooks';
-import { defaultRow } from '@/stores/tables/elt/default-values';
+import { trpcClient } from '@/trpc/client';
-import { useApolloClient } from '@apollo/client';
 import { observer } from 'mobx-react-lite';
-import { omit, sift } from 'radash';
-import { useCallback } from 'react';
 import { Flex } from 'ui/grid';
 
 const storeSelector: StoreSelector = ({ kasko }) => kasko;
 
-const initialData = {
-  ...omit(defaultRow, ['name', 'key', 'id']),
-  error: null,
-  kaskoSum: 0,
-  paymentPeriods: [
-    {
-      kaskoSum: 0,
-    },
-  ],
-};
-
 export const Kasko = observer(() => {
   const store = useStore();
   const { $calculation, $tables } = store;
-  const apolloClient = useApolloClient();
-  const { init } = helper({ apolloClient, store });
 
-  const handleOnClick = useCallback(async () => {
+  const calculateKasko = trpcClient.eltKasko.useMutation({
-    $tables.elt.kasko.abortController?.abort();
+    onError() {
-    $tables.elt.kasko.abortController = new AbortController();
+      $tables.elt.kasko.setRows(
-
+        $tables.elt.kasko.getRows.map((row) => ({ ...row, status: 'error' }))
-    const { kasko } = await init();
-    $tables.elt.kasko.setRows(kasko);
-    const kaskoCompanyIds = sift(
-      $tables.insurance
-        .row('kasko')
-        .getOptions('insuranceCompany')
-        .map((x) => x.value)
       );
-    const values = $calculation.$values.getValues();
+    },
+    onMutate: () => {
+      const rows = $tables.elt.kasko.getRows;
+      $tables.elt.kasko.setRows(rows.map((row) => ({ ...resetRow(row), status: 'fetching' })));
+    },
+    onSuccess: ({ rows }) => {
+      $tables.elt.kasko.setRows(rows);
+    },
+  });
 
-    kaskoCompanyIds.forEach((key) => {
+  function handleOnClick() {
-      const row = $tables.elt.kasko.getRow(key);
+    calculateKasko.mutate({
-      if (row) {
+      calculation: {
-        $tables.elt.kasko.setRow({ key, status: 'fetching' });
+        values: store.$calculation.$values.getValues(),
-        makeEltKaskoRequest({ apolloClient, store }, row)
+      },
-          .then((payload) =>
-            getEltKasko(payload, { signal: $tables.elt.kasko.abortController?.signal })
-          )
-          .then((res) => {
-            if (res) {
-              const {
-                kaskoSum = 0,
-                message,
-                paymentPeriods,
-                requestId,
-                skCalcId,
-                totalFranchise = 0,
-              } = res;
-              let { error } = res;
-
-              const sum =
-                values.leasingPeriod <= 16 ? kaskoSum : paymentPeriods?.[0]?.kaskoSum || 0;
-
-              if (totalFranchise > MAX_FRANCHISE) {
-                error ||= `Франшиза по страховке превышает максимально допустимое значение: ${Intl.NumberFormat(
-                  'ru',
-                  {
-                    currency: 'RUB',
-                    style: 'currency',
-                  }
-                ).format(MAX_FRANCHISE)}`;
-              }
-
-              if (sum > MAX_INSURANCE) {
-                error ||= `Сумма по страховке превышает максимально допустимое значение по стоимости КАСКО: ${Intl.NumberFormat(
-                  'ru',
-                  {
-                    currency: 'RUB',
-                    style: 'currency',
-                  }
-                ).format(MAX_INSURANCE)}`;
-              }
-
-              if (sum < MIN_INSURANCE) {
-                error ||= `Сумма по страховке не должна быть меньше допустимого значения по стоимости КАСКО: ${Intl.NumberFormat(
-                  'ru',
-                  {
-                    currency: 'RUB',
-                    style: 'currency',
-                  }
-                ).format(MIN_INSURANCE)}`;
-              }
-
-              $tables.elt.kasko.setRow({
-                key,
-                message: error || message,
-                numCalc: '0',
-                requestId,
-                skCalcId,
-                status: error ? 'error' : null,
-                sum,
-                totalFranchise,
     });
   }
-          })
-          .catch((error) => {
-            const _err = error as Error;
-            $tables.elt.kasko.setRow({
-              ...initialData,
-              key,
-              message: _err.message || String(error),
-              status: 'error',
-            });
-          });
-      }
-    });
-  }, [$calculation.$values, $tables.elt.kasko, $tables.insurance, apolloClient, init, store]);
 
   function handleOnSelectRow(row: Row) {
     $tables.insurance.row('kasko').column('insuranceCompany').setValue(row.key);

apps/web/Components/Calculation/Form/ELT/Osago.tsx

@@ -2,125 +2,41 @@
 /* eslint-disable sonarjs/cognitive-complexity */
 import { PolicyTable, ReloadButton, Validation } from './Components';
 import { columns } from './lib/config';
-import { makeEltOsagoRequest, makeOwnOsagoRequest } from './lib/make-request';
+import { resetRow } from './lib/tools';
 import type { Row, StoreSelector } from './types';
-import { getEltOsago } from '@/api/elt/query';
-import { MAX_INSURANCE, MIN_INSURANCE } from '@/constants/values';
-import helper from '@/process/elt/lib/helper';
 import { useStore } from '@/stores/hooks';
-import { defaultRow } from '@/stores/tables/elt/default-values';
+import { trpcClient } from '@/trpc/client';
-import { useApolloClient } from '@apollo/client';
 import { observer } from 'mobx-react-lite';
-import { omit, sift } from 'radash';
-import { useCallback } from 'react';
 import { Flex } from 'ui/grid';
 
 const storeSelector: StoreSelector = ({ osago }) => osago;
 
-const initialData = {
-  ...omit(defaultRow, ['name', 'key', 'id']),
-  error: null,
-  premiumSum: 0,
-};
-
 export const Osago = observer(() => {
   const store = useStore();
   const { $tables } = store;
-  const apolloClient = useApolloClient();
-  const { init } = helper({ apolloClient, store });
 
-  const handleOnClick = useCallback(async () => {
+  const calculateOsago = trpcClient.eltOsago.useMutation({
-    $tables.elt.osago.abortController?.abort();
+    onError() {
-    $tables.elt.osago.abortController = new AbortController();
+      $tables.elt.osago.setRows(
-
+        $tables.elt.osago.getRows.map((row) => ({ ...row, status: 'error' }))
-    const { osago } = await init();
-    $tables.elt.osago.setRows(osago);
-    const osagoCompanyIds = sift(
-      $tables.insurance
-        .row('osago')
-        .getOptions('insuranceCompany')
-        .map((x) => x.value)
       );
+    },
+    onMutate: () => {
+      const rows = $tables.elt.osago.getRows;
+      $tables.elt.osago.setRows(rows.map((row) => ({ ...resetRow(row), status: 'fetching' })));
+    },
+    onSuccess: ({ rows }) => {
+      $tables.elt.osago.setRows(rows);
+    },
+  });
 
-    osagoCompanyIds.forEach((key) => {
+  async function handleOnClick() {
-      const row = $tables.elt.osago.getRow(key);
+    calculateOsago.mutate({
-      if (row) {
+      calculation: {
-        row.status = 'fetching';
+        values: store.$calculation.$values.getValues(),
-        $tables.elt.osago.setRow(row);
+      },
-
-        if (row.metodCalc === 'CRM') {
-          makeOwnOsagoRequest({ apolloClient, store }, row).then((res) => {
-            if (!res) {
-              $tables.elt.osago.setRow({
-                key,
-                message:
-                  'Для получения расчета ОСАГО следует использовать калькулятор ЭЛТ или Индивидуальный запрос',
-                numCalc: undefined,
-                skCalcId: undefined,
-                status: 'error',
-                sum: 0,
-                totalFranchise: 0,
-              });
-            } else {
-              $tables.elt.osago.setRow({
-                key,
-                message: null,
-                numCalc: res.evo_id || undefined,
-                status: null,
-                sum: res.evo_graph_price_withoutnds || undefined,
     });
   }
-          });
-        } else {
-          makeEltOsagoRequest({ apolloClient, store }, row)
-            .then((payload) =>
-              getEltOsago(payload, { signal: $tables.elt.osago.abortController.signal })
-            )
-            .then((res) => {
-              if (res) {
-                const { message, numCalc, premiumSum = 0, skCalcId } = res;
-                let { error } = res;
-                if (premiumSum > MAX_INSURANCE) {
-                  error ||= `Сумма по страховке превышает максимально допустимое значение по стоимости ОСАГО: ${Intl.NumberFormat(
-                    'ru',
-                    {
-                      currency: 'RUB',
-                      style: 'currency',
-                    }
-                  ).format(MAX_INSURANCE)}`;
-                }
-                if (premiumSum < MIN_INSURANCE) {
-                  error ||= `Сумма по страховке не должна быть меньше допустимого значения по стоимости ОСАГО: ${Intl.NumberFormat(
-                    'ru',
-                    {
-                      currency: 'RUB',
-                      style: 'currency',
-                    }
-                  ).format(MIN_INSURANCE)}`;
-                }
-                $tables.elt.osago.setRow({
-                  key,
-                  message: error || message,
-                  numCalc: `${numCalc}`,
-                  skCalcId,
-                  status: error ? 'error' : null,
-                  sum: premiumSum,
-                });
-              }
-            })
-            .catch((error) => {
-              const _err = error as Error;
-              $tables.elt.osago.setRow({
-                ...initialData,
-                key,
-                message: _err.message || String(error),
-                status: 'error',
-              });
-            });
-        }
-      }
-    });
-  }, [$tables.elt.osago, $tables.insurance, apolloClient, init, store]);
 
   function handleOnSelectRow(row: Row) {
     $tables.insurance.row('osago').column('insuranceCompany').setValue(row.key);

apps/web/Components/Calculation/Form/ELT/lib/config.tsx

@@ -1,10 +1,7 @@
-import type { RowSchema } from '@/config/schema/elt';
+import type { Row } from '../types';
 import type { ColumnsType } from 'antd/lib/table';
 import { CloseOutlined, LoadingOutlined } from 'ui/elements/icons';
 import { Flex } from 'ui/grid';
-import type { z } from 'zod';
-
-type Row = z.infer<typeof RowSchema>;
 
 const formatter = Intl.NumberFormat('ru', {
   currency: 'RUB',

apps/web/Components/Calculation/Form/ELT/lib/tools.ts

@@ -0,0 +1,12 @@
+import type { Row } from '@/Components/Calculation/Form/ELT/types';
+import { defaultRow } from '@/stores/tables/elt/default-values';
+
+export function resetRow(row: Row): Row {
+  return {
+    ...defaultRow,
+    id: row.id,
+    key: row.key,
+    metodCalc: row.metodCalc,
+    name: row.name,
+  };
+}

apps/web/Components/Calculation/Form/Insurance/config.ts

@@ -1,13 +1,14 @@
 import type { FormTabRows } from '../../lib/render-rows';
+import { transformRowsForMobile } from '../lib/utils';
 
 export const id = 'insurance';
 export const title = 'Страхование';
 
 export const rows: FormTabRows = [
   [['tbxLeaseObjectYear', 'selectLeaseObjectUseFor', 'selectLegalClientRegion']],
-  [['selectEngineType', 'tbxInsFranchise', 'selectLegalClientTown']],
+  [['tbxMileage', 'tbxInsFranchise', 'selectLegalClientTown']],
-  [['selectLeaseObjectCategory', 'tbxMileage']],
+  [['selectGPSBrand', 'cbxWithTrailer', 'selectInsNSIB']],
-  [['tbxLeaseObjectMotorPower', 'cbxWithTrailer', 'selectGPSBrand']],
+  [['selectGPSModel', 'cbxInsDecentral', 'selectLeasingWithoutKasko']],
-  [['tbxEngineVolume', 'cbxInsDecentral', 'selectGPSModel']],
-  [['selectLeasingWithoutKasko', 'selectInsNSIB']],
 ];
+
+export const mobileRows = transformRowsForMobile(rows);

apps/web/Components/Calculation/Form/Insurance/index.jsx

@@ -1,15 +1,15 @@
 import renderFormRows from '../../lib/render-rows';
-import { id, rows, title } from './config';
+import { id, mobileRows, rows, title } from './config';
 import FinGAPTable from './FinGAPTable';
 import InsuranceTable from './InsuranceTable';
+import { Media } from '@/styles/media';
 import { Flex } from 'ui/grid';
 
 function Insurance() {
-  const renderedRows = renderFormRows(rows);
-
   return (
     <Flex flexDirection="column">
-      {renderedRows}
+      <Media lessThan="laptop">{renderFormRows(mobileRows)}</Media>
+      <Media greaterThanOrEqual="laptop">{renderFormRows(rows)}</Media>
       <InsuranceTable />
       <FinGAPTable />
     </Flex>

apps/web/Components/Calculation/Form/LeasingObject/config.ts

@@ -1,4 +1,5 @@
 import type { FormTabRows } from '../../lib/render-rows';
+import { transformRowsForMobile } from '../lib/utils';
 
 export const id = 'leasing-object';
 export const title = 'ПЛ';
@@ -16,3 +17,5 @@ export const rows: FormTabRows = [
   [['selectLeaseObjectCategory', 'tbxEngineVolume', 'tbxMileage']],
   [['tbxMaxMass', 'tbxEngineHours', 'tbxVIN']],
 ];
+
+export const mobileRows = transformRowsForMobile(rows);

apps/web/Components/Calculation/Form/LeasingObject/index.jsx

@@ -1,8 +1,14 @@
 import renderFormRows from '../../lib/render-rows';
-import { id, rows, title } from './config';
+import { id, mobileRows, rows, title } from './config';
+import { Media } from '@/styles/media';
 
 function LeasingObject() {
-  return renderFormRows(rows);
+  return (
+    <>
+      <Media lessThan="laptop">{renderFormRows(mobileRows)}</Media>
+      <Media greaterThanOrEqual="laptop">{renderFormRows(rows)}</Media>
+    </>
+  );
 }
 
 export default {

apps/web/Components/Calculation/Form/SupplierAgent/config.ts

@@ -1,4 +1,5 @@
 import type { FormTabRows } from '../../lib/render-rows';
+import { transformRowsForMobile } from '../lib/utils';
 
 export const id = 'supplier-agent';
 export const title = 'Поставщик/агент';
@@ -20,3 +21,5 @@ export const rows: FormTabRows = [
   [['selectCalcBrokerRewardCondition', 'selectFinDepartmentRewardCondtion'], defaultRowStyle],
   [['tbxCalcBrokerRewardSum', 'tbxFinDepartmentRewardSumm'], defaultRowStyle],
 ];
+
+export const mobileRows = transformRowsForMobile(rows);

apps/web/Components/Calculation/Form/SupplierAgent/index.jsx

@@ -1,8 +1,14 @@
 import renderFormRows from '../../lib/render-rows';
-import { id, rows, title } from './config';
+import { id, mobileRows, rows, title } from './config';
+import { Media } from '@/styles/media';
 
 function Leasing() {
-  return renderFormRows(rows);
+  return (
+    <>
+      <Media lessThan="laptop">{renderFormRows(mobileRows)}</Media>
+      <Media greaterThanOrEqual="laptop">{renderFormRows(rows)}</Media>
+    </>
+  );
 }
 
 export default {

apps/web/Components/Calculation/Form/index.jsx

@@ -8,7 +8,9 @@ import Payments from './Payments';
 import SupplierAgent from './SupplierAgent';
 import Unlimited from './Unlimited';
 import Background from '@/Components/Layout/Background';
+import { useStore } from '@/stores/hooks';
 import { min } from '@/styles/mq';
+import { memo } from 'react';
 import styled from 'styled-components';
 import { Tabs } from 'ui/elements';
 
@@ -44,13 +46,16 @@ const ComponentWrapper = styled.div`
   }
 `;
 
-export function Form({ prune }) {
+export const Form = memo(() => {
+  const { $process } = useStore();
+
+  const filteredTabs =
+    $process.has('Unlimited') === false ? formTabs.filter((x) => x.id !== 'unlimited') : formTabs;
+
   return (
     <Wrapper>
       <Tabs type="card" tabBarGutter="5px">
-        {formTabs
+        {filteredTabs.map(({ Component, id, title }) => (
-          .filter((tab) => !prune?.includes(tab.id))
-          .map(({ Component, id, title }) => (
           <Tabs.TabPane tab={title} key={id}>
             <ComponentWrapper>
               <Component />
@@ -60,4 +65,4 @@ export function Form({ prune }) {
       </Tabs>
     </Wrapper>
   );
-}
+});

apps/web/Components/Calculation/Form/lib/utils.js

@@ -0,0 +1,32 @@
+/**
+ *
+ * @param {import('../../lib/render-rows').FormTabRows} rows
+ * @returns {import('../../lib/render-rows').FormTabRows}
+ */
+export function transformRowsForMobile(rows) {
+  const mobileRows = [];
+  let columnGroups = {};
+
+  rows.forEach((row) => {
+    if (Array.isArray(row)) {
+      row[0].forEach((item, index) => {
+        if (!columnGroups[index]) {
+          columnGroups[index] = [];
+        }
+        columnGroups[index].push(item);
+      });
+    } else {
+      Object.values(columnGroups).forEach((group) => {
+        mobileRows.push([group, { gridTemplateColumns: '1fr' }]);
+      });
+      columnGroups = {};
+      mobileRows.push(row);
+    }
+  });
+
+  Object.values(columnGroups).forEach((group) => {
+    mobileRows.push([group, { gridTemplateColumns: '1fr' }]);
+  });
+
+  return mobileRows;
+}

apps/web/Components/Calculation/Output/Validation.jsx

@@ -23,73 +23,34 @@ const AlertWrapper = styled(Box)`
   margin: 0 0 5px 0;
 `;
 
+function getAlerts(errors, title, $process) {
+  return errors.map(({ key, message }) => (
+    <AlertWrapper>
+      <Alert
+        key={key}
+        type={$process.has('Unlimited') ? 'warning' : 'error'}
+        showIcon
+        message={Message(title, message)}
+      />
+    </AlertWrapper>
+  ));
+}
+
 function getElementsErrors({ $calculation, $process }) {
   return Object.values($calculation.$validation).map((validation) => {
     const elementErrors = validation.getErrors();
     const elementTitle = validation.params.err_title;
 
-    return elementErrors.map(({ key, message }) => (
+    return getAlerts(elementErrors, elementTitle, $process);
-      <AlertWrapper>
-        <Alert
-          key={key}
-          type={$process.has('Unlimited') ? 'warning' : 'error'}
-          showIcon
-          message={Message(elementTitle, message)}
-        />
-      </AlertWrapper>
-    ));
   });
 }
 
-function getPaymentsTableErrors({ $process, $tables }) {
+function getTableErrors(tableName, { $process, $tables }) {
-  const { payments } = $tables;
+  const table = $tables[tableName];
-  const errors = payments.validation.getErrors();
+  const errors = table.validation.getErrors();
-  const title = payments.validation.params.err_title;
+  const title = table.validation.params.err_title;
 
-  return errors.map(({ key, message }) => (
+  return getAlerts(errors, title, $process);
-    <AlertWrapper>
-      <Alert
-        key={key}
-        type={$process.has('Unlimited') ? 'warning' : 'error'}
-        showIcon
-        message={Message(title, message)}
-      />
-    </AlertWrapper>
-  ));
-}
-
-function getInsuranceTableErrors({ $process, $tables }) {
-  const { insurance } = $tables;
-  const errors = insurance.validation.getErrors();
-  const title = insurance.validation.params.err_title;
-
-  return errors.map(({ key, message }) => (
-    <AlertWrapper>
-      <Alert
-        key={key}
-        type={$process.has('Unlimited') ? 'warning' : 'error'}
-        showIcon
-        message={Message(title, message)}
-      />
-    </AlertWrapper>
-  ));
-}
-
-function getFingapTableErrors({ $process, $tables }) {
-  const { fingap } = $tables;
-  const errors = fingap.validation.getErrors();
-  const title = fingap.validation.params.err_title;
-
-  return errors.map(({ key, message }) => (
-    <AlertWrapper>
-      <Alert
-        key={key}
-        type={$process.has('Unlimited') ? 'warning' : 'error'}
-        showIcon
-        message={Message(title, message)}
-      />
-    </AlertWrapper>
-  ));
 }
 
 const Errors = observer(() => {
@@ -101,15 +62,16 @@ const Errors = observer(() => {
   );
   const hasPaymentsErrors = $tables.payments.validation.hasErrors;
   const hasInsuranceErrors = $tables.insurance.validation.hasErrors;
+  const hasFingapErrors = $tables.fingap.validation.hasErrors;
 
-  if (!hasElementsErrors && !hasPaymentsErrors && !hasInsuranceErrors) {
+  if (!hasElementsErrors && !hasPaymentsErrors && !hasInsuranceErrors && !hasFingapErrors) {
     return <Alert type="success" showIcon message="Ошибок нет 🙂" />;
   }
 
   const elementsErrors = getElementsErrors(store);
-  const paymentsErrors = getPaymentsTableErrors(store);
+  const paymentsErrors = getTableErrors('payments', store);
-  const insuranceErrors = getInsuranceTableErrors(store);
+  const insuranceErrors = getTableErrors('insurance', store);
-  const fingapErrors = getFingapTableErrors(store);
+  const fingapErrors = getTableErrors('fingap', store);
 
   const errors = [...elementsErrors, ...paymentsErrors, ...insuranceErrors, ...fingapErrors];
 

apps/web/Components/Calculation/Output/index.jsx

@@ -42,7 +42,7 @@ const Wrapper = styled(Background)`
   }
 `;
 
-export const Output = observer(() => {
+export const Output = observer(({ tabs }) => {
   const { $results } = useStore();
   const [activeKey, setActiveKey] = useState(undefined);
   const { hasErrors } = useErrors();
@@ -52,15 +52,15 @@ export const Output = observer(() => {
       setActiveKey('payments-table');
     }
 
-    if (hasErrors) {
+    if (!tabs && hasErrors) {
       setActiveKey('validation');
     }
-  }, [$results.payments.length, hasErrors]);
+  }, [$results.payments.length, hasErrors, tabs]);
 
   return (
     <Wrapper>
       <Tabs
-        items={items}
+        items={tabs ? items.filter((x) => x.key !== 'validation') : items}
         activeKey={activeKey}
         onChange={(key) => {
           setActiveKey(key);

apps/web/Components/Calculation/Settings/config.ts

@@ -18,8 +18,8 @@ export const mainRows: FormTabRows = [
   [
     ['btnCreateKP', 'linkDownloadKp'],
     {
-      gap: [0, '10px'],
+      gap: ['10px'],
-      gridTemplateColumns: ['1fr', '1fr 1fr'],
+      gridTemplateColumns: ['1fr 1fr'],
     },
   ],
 ];
@@ -41,8 +41,8 @@ export const unlimitedMainRows: FormTabRows = [
   [
     ['btnCreateKP', 'linkDownloadKp'],
     {
-      gap: [0, '10px'],
+      gap: ['10px'],
-      gridTemplateColumns: ['1fr', '1fr 1fr'],
+      gridTemplateColumns: ['1fr 1fr'],
     },
   ],
 ];

apps/web/Components/Calculation/Settings/index.jsx

@@ -3,6 +3,7 @@ import * as config from './config';
 import Background from '@/Components/Layout/Background';
 import { useStore } from '@/stores/hooks';
 import { min } from '@/styles/mq';
+import { memo } from 'react';
 import styled from 'styled-components';
 
 const Wrapper = styled(Background)`
@@ -17,7 +18,7 @@ const Wrapper = styled(Background)`
   }
 `;
 
-export function Settings() {
+export const Settings = memo(() => {
   const { $process } = useStore();
 
   const mainRows = $process.has('Unlimited')
@@ -33,4 +34,4 @@ export function Settings() {
       {paramsRows}
     </Wrapper>
   );
-}
+});

apps/web/Components/Calculation/Validation/index.jsx

@@ -0,0 +1,19 @@
+import Validation from '../Output/Validation';
+import Background from '@/Components/Layout/Background';
+import { min } from '@/styles/mq';
+import { memo } from 'react';
+import styled from 'styled-components';
+
+const Wrapper = styled(Background)`
+  padding: 4px 10px;
+
+  ${min('laptop')} {
+    padding: 4px 18px;
+  }
+`;
+
+export const Component = memo(() => (
+  <Wrapper>
+    <Validation.Component />
+  </Wrapper>
+));

apps/web/Components/Calculation/config/elements-components.ts

@@ -136,6 +136,7 @@ const components = wrapComponentsMap({
   cbxPartialVAT: e.Switch,
   cbxFloatingRate: e.Switch,
   cbxQuotePriceWithFullVAT: e.Switch,
+  cbxQuoteShowAcceptLimit: e.Switch,
 
   /** Readonly Elements */
   labelLeaseObjectRisk: e.Text,

apps/web/Components/Calculation/config/elements-titles.ts

@@ -130,6 +130,7 @@ const titles: Record<ActionElements | ValuesElements, string> = {
   cbxPartialVAT: 'Частичный НДС',
   cbxFloatingRate: 'Плавающая ставка',
   cbxQuotePriceWithFullVAT: 'Отображать Стоимость ПЛ с полным НДС',
+  cbxQuoteShowAcceptLimit: 'Отображать одобренный лимит',
 
   /** Link Elements */
   linkDownloadKp: '',

apps/web/Components/Calculation/config/elements-types.ts

@@ -195,6 +195,7 @@ const types = wrapElementsTypes({
   cbxPartialVAT: t.Switch,
   cbxFloatingRate: t.Switch,
   cbxQuotePriceWithFullVAT: t.Switch,
+  cbxQuoteShowAcceptLimit: t.Switch,
 
   labelLeaseObjectRisk: t.Readonly,
   tbxInsKaskoPriceLeasePeriod: t.Readonly,

apps/web/Components/Calculation/config/map/values.ts

@@ -133,6 +133,7 @@ const elementsToValues = wrapElementsMap({
   cbxPartialVAT: 'partialVAT',
   cbxFloatingRate: 'floatingRate',
   cbxQuotePriceWithFullVAT: 'quotePriceWithFullVAT',
+  cbxQuoteShowAcceptLimit: 'quoteShowAcceptLimit',
 
   /** Readonly Elements */
   labelLeaseObjectRisk: 'leaseObjectRiskName',

apps/web/Components/Calculation/index.ts

@@ -1,4 +0,0 @@
-export * from './Form';
-export * from './Layout';
-export * from './Output';
-export * from './Settings';

apps/web/Components/Calculation/index.tsx

@@ -0,0 +1,101 @@
+import { Form } from './Form';
+import { Layout } from './Layout';
+import { Output } from './Output';
+import { Settings } from './Settings';
+import { Component as Validation } from './Validation';
+import { Notification } from '@/Components/Common';
+import { NavigationBar, Tabs } from '@/Components/Layout/Navigation';
+import { NavigationProvider } from '@/context/navigation';
+import { useErrors, useResults } from '@/stores/hooks';
+import { Media } from '@/styles/media';
+import { getPageTitle } from '@/utils/page';
+import { observer } from 'mobx-react-lite';
+import Head from 'next/head';
+import styled from 'styled-components';
+import { Badge } from 'ui/elements';
+import {
+  BarChartOutlined,
+  CalculatorOutlined,
+  ProfileOutlined,
+  WarningOutlined,
+} from 'ui/elements/icons';
+
+const defaultIconStyle = { fontSize: '1.2rem' };
+
+const StyledBadge = styled(Badge)`
+  color: unset !important;
+`;
+
+export const tabs = [
+  {
+    Component: Settings,
+    Icon: () => <ProfileOutlined style={defaultIconStyle} />,
+    key: 'settings',
+    title: 'Интерес/Расчет',
+  },
+  {
+    Component: Form,
+    Icon: () => <CalculatorOutlined style={defaultIconStyle} />,
+    key: 'form',
+    title: 'Параметры',
+  },
+  {
+    Component: Output,
+    Icon: observer(() => {
+      const { hasResults } = useResults();
+
+      return (
+        <StyledBadge status="success" dot={hasResults}>
+          <BarChartOutlined style={defaultIconStyle} />
+        </StyledBadge>
+      );
+    }),
+    key: 'output',
+    title: 'Результаты',
+  },
+  {
+    Component: Validation,
+    Icon: observer(() => {
+      const { hasErrors } = useErrors();
+
+      return (
+        <StyledBadge status="error" dot={hasErrors}>
+          <WarningOutlined style={defaultIconStyle} />
+        </StyledBadge>
+      );
+    }),
+    key: 'errors',
+    title: 'Ошибки',
+  },
+];
+
+type ContentProps = {
+  readonly initHooks: () => void;
+  readonly title: string;
+};
+
+export function Content({ initHooks, title }: ContentProps) {
+  initHooks();
+
+  return (
+    <>
+      <Head>
+        <title>{getPageTitle(title)}</title>
+      </Head>
+      <Notification />
+      <Media lessThan="laptop">
+        <NavigationProvider>
+          <Tabs tabs={tabs} />
+          <NavigationBar />
+        </NavigationProvider>
+      </Media>
+      <Media greaterThanOrEqual="laptop">
+        <Layout>
+          <Form />
+          <Settings />
+          <Output />
+        </Layout>
+      </Media>
+    </>
+  );
+}

apps/web/Components/Common/Notification.tsx

@@ -1,4 +1,7 @@
 /* eslint-disable import/no-mutable-exports */
+import { ERROR_KEYS } from '@/@types/errors';
+import { Media } from '@/styles/media';
+import { getDevice } from '@/utils/device';
 import type { MessageInstance } from 'antd/es/message/interface';
 import type { NotificationInstance } from 'antd/es/notification/interface';
 import type { ReactNode } from 'react';
@@ -7,9 +10,44 @@ import { message as antdMessage, notification as antdNotification } from 'ui/ele
 export let message: Readonly<MessageInstance>;
 export let notification: Readonly<NotificationInstance>;
 
-export function Notification({ children }: { readonly children: ReactNode }) {
+function createWrapper<T extends NotificationInstance, M extends MessageInstance>(
+  notificationObj: T,
+  messageObj: M
+): T {
+  const handler: ProxyHandler<T> = {
+    get(target, prop, receiver) {
+      const notificationMethod = target[prop as keyof T];
+      const messageMethod = messageObj[prop as keyof M];
+
+      if (typeof notificationMethod === 'function' && typeof messageMethod === 'function') {
+        return function (...args: any[]) {
+          const device = getDevice();
+
+          if (device?.isMobile) {
+            if (typeof args[0] === 'object') {
+              if (ERROR_KEYS.includes(args[0].key)) return;
+              args[0].content = args[0].description || args[0].message;
+            }
+
+            messageMethod.apply(messageObj, args);
+          }
+
+          notificationMethod.apply(target, args);
+        };
+      }
+
+      return Reflect.get(target, prop, receiver);
+    },
+  };
+
+  return new Proxy(notificationObj, handler);
+}
+
+export function Notification({ children }: { readonly children?: ReactNode }) {
+  const device = getDevice();
+
   const [messageApi, messageContextHolder] = antdMessage.useMessage({
-    duration: 1.2,
+    duration: device?.isMobile ? 1.5 : 1.2,
     maxCount: 3,
     top: 70,
   });
@@ -21,12 +59,12 @@ export function Notification({ children }: { readonly children: ReactNode }) {
   });
 
   message = messageApi;
-  notification = notificationApi;
+  notification = createWrapper(notificationApi, messageApi);
 
   return (
     <>
       {messageContextHolder}
-      {notificationContextHolder}
+      <Media greaterThanOrEqual="laptop">{notificationContextHolder}</Media>
       {children}
     </>
   );

apps/web/Components/Layout/Auth.jsx

@@ -10,7 +10,7 @@ const UserText = styled.span`
   padding: 0;
   text-transform: uppercase;
   color: #fff;
-  font-size: 0.5rem;
+  font-size: 0.55rem;
   font-family: 'Montserrat';
   font-weight: 500;
   line-height: 1;

apps/web/Components/Layout/Menu.tsx

@@ -49,7 +49,7 @@ const items: MenuProps['items'] = [
   },
 ];
 
-export function AppNavigation() {
+export function AppMenu() {
   const { pathname } = useRouter();
 
   return (

apps/web/Components/Layout/Navigation.jsx

@@ -0,0 +1,64 @@
+import { NavigationContext } from '@/context/navigation';
+import { useContext, useEffect } from 'react';
+import styled from 'styled-components';
+import { Flex } from 'ui/grid';
+
+const Container = styled.div`
+  background-color: white;
+  bottom: 0;
+  display: flex;
+  flex-direction: row;
+  gap: 10px;
+  height: 46px;
+  justify-content: space-around;
+  position: fixed;
+  width: 100%;
+  border-top: 1px solid rgba(5, 5, 5, 0.06);
+  z-index: 999999;
+`;
+
+const TabButton = styled.button`
+  background: ${({ active }) => (active ? 'var(--color-primary)' : 'white')};
+  color: ${({ active }) => (active ? 'white' : 'black')};
+  border-radius: 2px 2px 0 0;
+  border: none;
+  cursor: pointer;
+  height: 100%;
+  width: 100%;
+  font-size: 0.75rem;
+`;
+
+export function NavigationBar() {
+  const { currentTab, setCurrentTab, tabsList } = useContext(NavigationContext);
+
+  return (
+    <Container>
+      {tabsList.map(({ Icon, key, title }) => (
+        <TabButton key={key} active={key === currentTab} onClick={() => setCurrentTab(key)}>
+          <Flex flexDirection="column" alignItems="center">
+            <Icon />
+            {title}
+          </Flex>
+        </TabButton>
+      ))}
+    </Container>
+  );
+}
+
+const Display = styled.div`
+  display: ${(props) => (props.visible ? 'block' : 'none')};
+`;
+
+export function Tabs({ tabs }) {
+  const { currentTab, setTabsList } = useContext(NavigationContext);
+
+  useEffect(() => {
+    setTabsList(tabs);
+  }, [setTabsList, tabs]);
+
+  return tabs.map(({ Component, key }) => (
+    <Display key={key} visible={key === currentTab}>
+      <Component key={key} tabs />
+    </Display>
+  ));
+}

apps/web/Components/Layout/index.jsx

@@ -1,11 +1,15 @@
 import Header from './Header';
-import { AppNavigation } from './Navigation';
+import { AppMenu } from './Menu';
-import { min } from '@/styles/mq';
+import { max, min } from '@/styles/mq';
 import styled from 'styled-components';
 
 const Main = styled.main`
   margin: 8px 0;
 
+  ${max('laptop')} {
+    margin-bottom: calc(46px + 8px); // height of the navigation bar
+  }
+
   ${min('desktop-xl')} {
     margin: 8px 10%;
   }
@@ -15,7 +19,7 @@ export default function Layout({ children, user }) {
   return (
     <>
       <Header />
-      {user?.admin ? <AppNavigation /> : false}
+      {user?.admin ? <AppMenu /> : false}
       <Main>{children}</Main>
     </>
   );

apps/web/Dockerfile

@@ -2,14 +2,14 @@
 # Make sure you update both files!
 
 FROM node:alpine AS builder
-RUN corepack enable && corepack prepare pnpm@latest --activate
+RUN corepack enable && corepack prepare pnpm@8.9.0 --activate
 ENV PNPM_HOME=/usr/local/bin
 # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
 RUN apk add --no-cache libc6-compat
 RUN apk update
 # Set working directory
 WORKDIR /app
-RUN pnpm add -g turbo dotenv-cli
+RUN pnpm add -g turbo@1.12.4 dotenv-cli
 COPY . .
 RUN turbo prune --scope=web --docker
 
@@ -47,6 +47,8 @@ ARG URL_CORE_CALCULATE_DIRECT
 ARG URL_1C_TRANSTAX_DIRECT
 ARG URL_ELT_OSAGO_DIRECT
 ARG URL_ELT_KASKO_DIRECT
+ARG USERNAME_1C_TRANSTAX
+ARG PASSWORD_1C_TRANSTAX
 RUN pnpm dotenv -v NODE_ENV=production -e .env turbo run prebuild --filter=web...
 RUN pnpm dotenv -e .env turbo run build --filter=web...
 

apps/web/api/1c/types.ts

@@ -1,11 +1,12 @@
 export type RequestTransTax = {
+  CalcDate: string;
+  CarCategory: string;
   OKTMO: string;
-  calcDate: Date;
+  Power: number;
-  carCategory: string;
+  Year: number;
-  power: number;
-  year: number;
 };
 export type ResponseTransTax = {
-  error: string;
+  Error: string;
-  tax: number;
+  Tax: number;
+  TaxRate: number;
 };

apps/web/api/crm/types.ts

@@ -6,6 +6,7 @@ import ValuesSchema from '@/config/schema/values';
 import { z } from 'zod';
 
 export const RequestCreateKPSchema = z.object({
+  __info: z.record(z.any()).optional(),
   calculation: z
     .object({
       calculationValues: ValuesSchema,

apps/web/api/elt/query.ts

@@ -6,24 +6,18 @@ import axios from 'axios';
 
 const { URL_ELT_KASKO, URL_ELT_OSAGO } = getUrls();
 
-export async function getEltOsago(
+export async function getEltOsago(payload: ELT.RequestEltOsago) {
-  payload: ELT.RequestEltOsago,
-  { signal }: { signal: AbortSignal }
-) {
   return withHandleError(
     axios
-      .post<ELT.ResponseEltOsago>(URL_ELT_OSAGO, payload, { signal, timeout: TIMEOUT })
+      .post<ELT.ResponseEltOsago>(URL_ELT_OSAGO, payload, { timeout: TIMEOUT })
       .then(({ data }) => data)
   );
 }
 
-export async function getEltKasko(
+export async function getEltKasko(payload: ELT.RequestEltKasko) {
-  payload: ELT.RequestEltKasko,
-  { signal }: { signal: AbortSignal }
-) {
   return withHandleError(
     axios
-      .post<ELT.ResponseEltKasko>(URL_ELT_KASKO, payload, { signal, timeout: TIMEOUT })
+      .post<ELT.ResponseEltKasko>(URL_ELT_KASKO, payload, { timeout: TIMEOUT })
       .then(({ data }) => data)
   );
 }

apps/web/apollo/client.js

@@ -1,20 +1,24 @@
-import { link } from './link';
+import { createLink } from './link';
 import { ApolloClient, InMemoryCache } from '@apollo/client';
 import { isServer } from 'tools/common';
 
 /** @type {import('@apollo/client').ApolloClient<import('@apollo/client').NormalizedCacheObject>} */
 let apolloClient;
 
-function createApolloClient() {
+function createApolloClient(headers) {
   return new ApolloClient({
     cache: new InMemoryCache(),
-    link,
+    link: createLink(headers),
     ssrMode: isServer(),
   });
 }
 
-export default function initializeApollo(initialState = null) {
+export default function initializeApollo(initialState, headers) {
-  const _apolloClient = apolloClient ?? createApolloClient();
+  if (isServer() && !headers) {
+    throw new Error('initializeApollo: headers must be provided in server side');
+  }
+
+  const _apolloClient = apolloClient ?? createApolloClient(headers);
 
   // If your page has Next.js data fetching methods that use Apollo Client, the initial state
   // gets hydrated here

apps/web/apollo/link.js

@@ -1,11 +1,19 @@
 /* eslint-disable sonarjs/cognitive-complexity */
 import { message } from '@/Components/Common/Notification';
+import { publicRuntimeConfigSchema } from '@/config/schema/runtime-config';
 import getUrls from '@/config/urls';
 import { ApolloLink, from, HttpLink } from '@apollo/client';
+import { setContext } from '@apollo/client/link/context';
 import { onError } from '@apollo/client/link/error';
 import { getCurrentScope } from '@sentry/nextjs';
+import getConfig from 'next/config';
 import { isServer } from 'tools';
 
+function isSovkom(account) {
+  return account.label.toLowerCase().includes('совком');
+}
+
+export function createLink(headers) {
   const { URL_CRM_GRAPHQL } = getUrls();
 
   const modifyDataLink = new ApolloLink((operation, forward) => {
@@ -40,7 +48,15 @@ const modifyDataLink = new ApolloLink((operation, forward) => {
         }
 
         if (operation.operationName === 'GetInsuranceCompanies') {
-        response.data.accounts = response.data.accounts.map((account) => {
+          response.data.accounts = response.data.accounts
+            .sort((a, b) => {
+              if (isSovkom(a)) return -1;
+
+              if (isSovkom(b)) return 1;
+
+              return 0;
+            })
+            .map((account) => {
               const substring = account.label.match(/"(.+)"/u);
               if (substring)
                 return {
@@ -61,6 +77,36 @@ const httpLink = new HttpLink({
     uri: URL_CRM_GRAPHQL,
   });
 
+  const authLink = setContext((_, { headers: existingHeaders }) => {
+    if (process.env.NODE_ENV === 'development') {
+      const { publicRuntimeConfig } = getConfig();
+      const { DEV_AUTH_TOKEN } = publicRuntimeConfigSchema.parse(publicRuntimeConfig);
+
+      if (DEV_AUTH_TOKEN)
+        return {
+          headers: {
+            ...existingHeaders,
+            authorization: `Bearer ${DEV_AUTH_TOKEN}`,
+          },
+        };
+    }
+
+    if (isServer()) {
+      return {
+        headers: {
+          ...existingHeaders,
+          authorization: headers?.authorization,
+        },
+      };
+    }
+
+    return {
+      headers: {
+        ...existingHeaders,
+      },
+    };
+  });
+
   const key = 'APOLLO_GRAPHQL';
 
   const errorLink = onError(({ graphQLErrors, networkError, operation, response }) => {
@@ -83,4 +129,5 @@ const errorLink = onError(({ graphQLErrors, networkError, operation, response })
     });
   });
 
-export const link = from([errorLink, modifyDataLink, httpLink]);
+  return from([authLink, errorLink, modifyDataLink, httpLink]);
+}

apps/web/config/default-options.ts

@@ -104,7 +104,7 @@ export const selectObjectCategoryTax = [
 export const selectLeaseObjectUseFor = alphabetical(
   [
     {
-      label: 'Для представительских целей',
+      label: 'Для представительских целей / перевозки сотрудников ЛП',
       value: 100_000_000,
     },
     {
@@ -151,10 +151,10 @@ export const selectLeaseObjectUseFor = alphabetical(
       label: 'Для перевозки сотрудников других организаций (водитель ЛП)',
       value: 100_000_011,
     },
-    {
+    // {
-      label: 'Для перевозки сотрудников ЛП',
+    //   label: 'Для перевозки сотрудников ЛП',
-      value: 100_000_012,
+    //   value: 100_000_012,
-    },
+    // },
     {
       label: 'Для экскурсионных перевозок в т.ч. на торжества; трансфер в аэропорт и пр.',
       value: 100_000_013,
@@ -511,6 +511,7 @@ const defaultOptions: CalculationOptions = {
   cbxPartialVAT: [],
   cbxFloatingRate: [],
   cbxQuotePriceWithFullVAT: [],
+  cbxQuoteShowAcceptLimit: [],
 };
 
 export default defaultOptions;

apps/web/config/default-statuses.ts

@@ -18,6 +18,7 @@ const defaultStatuses: CalculationStatuses = {
   cbxPriceWithDiscount: 'Default',
   cbxQuotePriceWithFullVAT: 'Default',
   cbxQuoteRedemptionGraph: 'Default',
+  cbxQuoteShowAcceptLimit: 'Default',
   cbxRecalcWithRevision: 'Default',
   cbxRegistrationQuote: 'Default',
   cbxShowFinGAP: 'Default',

apps/web/config/default-values.ts

@@ -22,7 +22,7 @@ const defaultValues: CalculationValues = {
   comissionRub: 0,
   configuration: null,
   costIncrease: true,
-  countSeats: 0,
+  countSeats: 4,
   creditRate: RATE,
   dealer: null,
   dealerBroker: null,
@@ -144,6 +144,7 @@ const defaultValues: CalculationValues = {
   partialVAT: false,
   floatingRate: false,
   quotePriceWithFullVAT: false,
+  quoteShowAcceptLimit: true,
 };
 
 export default defaultValues;

apps/web/config/meta.jsx

@@ -2,6 +2,7 @@ import { withBasePath } from '@/config/urls';
 
 export const metaFavicon = (
   <>
+    <link rel="icon" type="image/x-icon" href={withBasePath('/favicon.ico')} sizes="32x32" />
     <link rel="apple-touch-icon" sizes="180x180" href={withBasePath('/apple-touch-icon.png')} />
     <link rel="icon" type="image/png" sizes="32x32" href={withBasePath('/favicon-32x32.png')} />
     <link rel="icon" type="image/png" sizes="16x16" href={withBasePath('/favicon-16x16.png')} />

apps/web/config/schema/elt.ts

@@ -270,6 +270,7 @@ export const ResultEltOsagoSchema = z.object({
 
 export const RowSchema = z.object({
   id: z.string(),
+  insuranceCondition: z.string().nullable(),
   key: z.string(),
   message: z.string().nullable(),
   metodCalc: z.union([z.literal('CRM'), z.literal('ELT')]),

apps/web/config/schema/env.js

@@ -2,6 +2,8 @@ const { z } = require('zod');
 
 const envSchema = z.object({
   BASE_PATH: z.string().optional().default(''),
+  DEV_AUTH_TOKEN: z.string().optional(),
+  PASSWORD_1C_TRANSTAX: z.string(),
   PORT: z.string().optional(),
   SENTRY_AUTH_TOKEN: z.string(),
   SENTRY_DSN: z.string(),
@@ -21,6 +23,7 @@ const envSchema = z.object({
   URL_ELT_OSAGO_DIRECT: z.string(),
   URL_GET_USER_DIRECT: z.string(),
   USE_DEV_COLORS: z.unknown().optional().transform(Boolean),
+  USERNAME_1C_TRANSTAX: z.string(),
 });
 
 module.exports = envSchema;

apps/web/config/schema/runtime-config.js

@@ -2,6 +2,7 @@ const envSchema = require('./env');
 
 const publicRuntimeConfigSchema = envSchema.pick({
   BASE_PATH: true,
+  DEV_AUTH_TOKEN: true,
   SENTRY_DSN: true,
   SENTRY_ENVIRONMENT: true,
   USE_DEV_COLORS: true,
@@ -9,6 +10,8 @@ const publicRuntimeConfigSchema = envSchema.pick({
 
 const serverRuntimeConfigSchema = envSchema.pick({
   BASE_PATH: true,
+  DEV_AUTH_TOKEN: true,
+  PASSWORD_1C_TRANSTAX: true,
   PORT: true,
   SENTRY_DSN: true,
   SENTRY_ENVIRONMENT: true,
@@ -25,6 +28,7 @@ const serverRuntimeConfigSchema = envSchema.pick({
   URL_ELT_KASKO_DIRECT: true,
   URL_ELT_OSAGO_DIRECT: true,
   URL_GET_USER_DIRECT: true,
+  USERNAME_1C_TRANSTAX: true,
 });
 
 module.exports = {

apps/web/config/schema/values.ts

@@ -129,6 +129,7 @@ const ValuesSchema = z.object({
   withTrailer: z.boolean(),
   partialVAT: z.boolean(),
   floatingRate: z.boolean(),
+  quoteShowAcceptLimit: z.boolean(),
 
   /**
    * Link Values

apps/web/constants/values.js

@@ -12,3 +12,5 @@ export const VEHICLE_SEATS = 20;
 export const ESN = 1.3;
 export const NSIB_MAX = 5_000_000;
 export const NDFL = 0.13;
+
+export const IRR_THRESHOLD = 0.001;

apps/web/context/navigation.tsx

@@ -0,0 +1,34 @@
+import { createContext, useEffect, useMemo, useState } from 'react';
+
+type Tab = {
+  icon: JSX.Element;
+  key: string;
+  title: string;
+  useShowBadge?: () => boolean;
+};
+
+type NavigationContextType = {
+  currentTab: string;
+  setCurrentTab: (tab: string) => void;
+  setTabsList: (list: Tab[]) => void;
+  tabsList: Tab[];
+};
+
+export const NavigationContext = createContext<NavigationContextType>({} as NavigationContextType);
+
+export function NavigationProvider({ children }: { readonly children: React.ReactNode }) {
+  const [currentTab, setCurrentTab] = useState('');
+  const [tabsList, setTabsList] = useState<Tab[]>([]);
+
+  useEffect(() => {
+    const defaultTab = tabsList.at(0);
+    if (defaultTab) setCurrentTab(defaultTab.key);
+  }, [tabsList]);
+
+  const value = useMemo(
+    () => ({ currentTab, setCurrentTab, setTabsList, tabsList }),
+    [currentTab, setCurrentTab, setTabsList, tabsList]
+  );
+
+  return <NavigationContext.Provider value={value}>{children}</NavigationContext.Provider>;
+}

apps/web/graphql/crm.query.graphql

@@ -36,7 +36,7 @@ query GetLeads($domainname: String) {
       andFilterConditions: { filterConditionString: { fieldName: "domainname", eq: $domainname } }
     }
   ) {
-    leads {
+    leads(orderby: { fieldName: "createdon", sortingType: DESC }) {
       label: fullname
       value: leadid
     }
@@ -85,7 +85,7 @@ query GetOpportunities($domainname: String) {
       andFilterConditions: { filterConditionString: { fieldName: "domainname", eq: $domainname } }
     }
   ) {
-    opportunities {
+    opportunities(orderby: { fieldName: "createdon", sortingType: DESC }) {
       label: name
       value: opportunityid
     }
@@ -137,6 +137,25 @@ query GetQuote($quoteId: UUID!) {
     evo_promotion
     evo_sale_without_nds
     link
+    evo_committee_quote
+    evo_msfo_irr
+    evo_accept_quoteid
+    evo_power
+    evo_engine_volume
+    evo_nsib
+    evo_addproduct_types {
+      evo_product_type
+    }
+    evo_db_accept_registration
+    evo_product_risks {
+      evo_addproduct_typeid
+    }
+    evo_fingap_payer
+    evo_osago_payer
+    evo_kasko_payer
+    evo_leasing_bonus_summ
+    evo_card_bonus_summ
+    evo_nsib_bonus_summ
   }
 }
 
@@ -236,7 +255,7 @@ query GetQuoteData($quoteId: UUID!) {
     evo_graphs {
       createdon
       evo_sumpay_withnds
-      evo_planpayments {
+      evo_planpayments(orderby: { fieldName: "evo_plandate", sortingType: ASC }) {
         evo_payment_ratio
       }
     }
@@ -290,6 +309,13 @@ query GetQuoteData($quoteId: UUID!) {
     evo_transactioncurrencyid
     evo_equip_price
     evo_coefficien_bonus_reducttion
+    evo_accept_limit_quote
+    evo_kasko_insurance_rulesidData {
+      evo_id
+    }
+    evo_osago_insurance_rulesiddData {
+      evo_id
+    }
   }
 }
 
@@ -339,6 +365,7 @@ query GetTarif($tarifId: UUID!) {
       evo_datefrom
       evo_rateid
       evo_type
+      statecode
     }
     evo_irr_plan
     evo_margin_min
@@ -657,16 +684,7 @@ query GetConfiguration($configurationId: UUID!) {
 }
 
 query GetDealers {
-  dealers: accounts(
+  dealers {
-    filterConditionGroup: {
-      andFilterConditions: [
-        { filterConditionMultyPicklist: { fieldName: "evo_account_type", oneof: [100000001] } }
-        { filterConditionInt: { fieldName: "statecode", eq: 0 } }
-        { filterConditionInt: { fieldName: "evo_legal_form", eq: 100000001 } }
-      ]
-    }
-    orderby: { fieldName: "name", sortingType: ASC }
-  ) {
     label: name
     value: accountid
     accountid
@@ -675,7 +693,7 @@ query GetDealers {
 }
 
 query GetDealer($dealerId: UUID!) {
-  dealer: account(accountid: $dealerId) {
+  dealer(accountid: $dealerId) {
     evo_return_leasing_dealer
     evo_broker_accountid
     evo_supplier_financing_accept
@@ -683,7 +701,7 @@ query GetDealer($dealerId: UUID!) {
 }
 
 query GetDealerPersons($dealerId: UUID!) {
-  dealerPersons: salon_providers(salonaccountid: $dealerId) {
+  dealerPersons: dealer_persons(salonaccountid: $dealerId) {
     label: name
     value: accountid
     accountid
@@ -694,16 +712,22 @@ query GetDealerPersons($dealerId: UUID!) {
 }
 
 query GetDealerPerson($dealerPersonId: UUID!) {
-  account(accountid: $dealerPersonId) {
+  dealer_person(accountid: $dealerPersonId) {
     evo_supplier_type
     evo_supplier_financing_accept
+    evo_return_leasing_dealer
+    evo_broker_accountid
+    evo_supplier_financing_accept
+    evo_legal_form
+    evo_inn
   }
 }
 
 query GetAgent($agentid: UUID!) {
-  agent: account(accountid: $agentid) {
+  agent(accountid: $agentid) {
     label: name
     value: accountid
+    evo_inn
   }
 }
 
@@ -1040,22 +1064,17 @@ query GetOsagoAddproductTypes($currentDate: DateTime) {
 }
 
 query GetInsuranceCompany($accountId: UUID!) {
-  account(accountid: $accountId) {
+  account: insurance(accountid: $accountId) {
     evo_osago_with_kasko
     evo_legal_region_calc
     accountid
+    evo_kasko_fact_part
+    evo_kasko_plan_part
   }
 }
 
 query GetInsuranceCompanies {
-  accounts(
+  accounts: insurances {
-    filterConditionGroup: {
-      andFilterConditions: [
-        { filterConditionMultyPicklist: { fieldName: "evo_account_type", oneof: [100000002] } }
-        { filterConditionInt: { fieldName: "statecode", eq: 0 } }
-      ]
-    }
-  ) {
     evo_type_ins_policy
     evo_evokasko_access
     evo_inn
@@ -1065,6 +1084,64 @@ query GetInsuranceCompanies {
     evo_id_elt
     evo_id_elt_smr
     evo_osago_id
+    evo_kasko_category
+    evo_osago_category
+  }
+}
+
+query GetEltInsuranceRules($currentDate: DateTime) {
+  evo_insurance_ruleses(
+    filterConditionGroup: {
+      andFilterConditions: [
+        { filterConditionInt: { fieldName: "statecode", eq: 0 } }
+        { filterConditionDateTime: { fieldName: "evo_datefrom", lte: $currentDate } }
+        { filterConditionDateTime: { fieldName: "evo_dateto", gte: $currentDate } }
+      ]
+    }
+  ) {
+    evo_id
+    evo_datefrom
+    evo_dateto
+    evo_risk
+    evo_category
+    evo_min_period
+    evo_max_period
+    evo_object_type
+    evo_use_for
+    evo_min_price
+    evo_max_price
+    evo_min_year
+    evo_max_year
+    evo_min_power
+    evo_max_power
+    evo_enginie_type
+    evo_opf
+    evo_min_mileage
+    evo_max_mileage
+    evo_brand
+    evo_model
+    evo_region
+    evo_dealer
+    evo_rules_type
+    evo_message
+    evo_discount
+    evo_insurer_accountid
+    evo_brand
+    evo_model
+    evo_region
+    evo_dealer
+    evo_brands {
+      evo_brandid
+    }
+    evo_models {
+      evo_modelid
+    }
+    accounts {
+      accountid
+    }
+    evo_regions {
+      evo_regionid
+    }
   }
 }
 

apps/web/hooks/worker.ts

@@ -0,0 +1,17 @@
+/* eslint-disable no-console */
+import { useEffect } from 'react';
+
+export function useServiceWorker() {
+  useEffect(() => {
+    if ('serviceWorker' in navigator) {
+      navigator.serviceWorker
+        .register('/sw.js')
+        .then((registration) => {
+          console.log('Service Worker registered with scope:', registration.scope);
+        })
+        .catch((error) => {
+          console.log('Service Worker registration failed:', error);
+        });
+    }
+  }, []);
+}

apps/web/mocks/handlers.js

@@ -39,20 +39,23 @@ export const handlers = [
   rest.post(URL_1C_TRANSTAX, (req, res, ctx) =>
     res(
       ctx.json({
-        error: null,
+        Error: null,
-        tax: _.random(100000, 200000),
+        Tax: _.random(100000, 200000),
       })
     )
   ),
-  rest.post(URL_ELT_OSAGO, async (req, res, ctx) => res(
+  rest.post(URL_ELT_OSAGO, async (req, res, ctx) =>
+    res(
       ctx.json({
         numCalc: _.random(1000000, 3000000),
         skCalcId: _.random(50000000, 60000000).toString(),
         premiumSum: _.random(10000, 20000),
         message: 'OSAGO Message',
       })
-    )),
+    )
-  rest.post(URL_ELT_KASKO, async (req, res, ctx) => res(
+  ),
+  rest.post(URL_ELT_KASKO, async (req, res, ctx) =>
+    res(
       ctx.json({
         requestId: _.random(3000000, 4000000).toString(),
         skCalcId: _.random(50000000, 60000000).toString(),
@@ -67,7 +70,8 @@ export const handlers = [
         ],
         totalFranchise: _.random(20000, 40000),
       })
-    )),
+    )
+  ),
 
   // rest.post(URL_CRM_GRAPHQL, (req, res, ctx) => {
   //   return res(ctx.status(503));

apps/web/next.config.js

@@ -29,6 +29,7 @@ module.exports = withSentryConfig(
     },
     experimental: {
       outputFileTracingRoot: path.join(__dirname, '../../'),
+      proxyTimeout: 1000 * 90,
     },
     images: {
       deviceSizes: devices,
@@ -65,10 +66,10 @@ module.exports = withSentryConfig(
           destination: env.URL_CORE_FINGAP_DIRECT,
           source: urls.URL_CORE_FINGAP_PROXY,
         },
-        {
+        // {
-          destination: env.URL_1C_TRANSTAX_DIRECT,
+        //   destination: env.URL_1C_TRANSTAX_DIRECT,
-          source: urls.URL_1C_TRANSTAX_PROXY,
+        //   source: urls.URL_1C_TRANSTAX_PROXY,
-        },
+        // },
         {
           destination: env.URL_ELT_KASKO_DIRECT,
           source: urls.URL_ELT_KASKO_PROXY,

apps/web/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "build": "next build",
-    "prebuild": "ts-node --project ./tsconfig.node.json ./scripts/generate-antd-css.ts",
+    "prebuild": "NODE_ENV=production ts-node --project ./tsconfig.node.json ./scripts/generate-antd-css.ts",
     "dev": "next dev",
     "predev": "ts-node --project ./tsconfig.node.json ./scripts/generate-antd-css.ts",
     "lint": "next lint",
@@ -16,6 +16,7 @@
   },
   "dependencies": {
     "@apollo/client": "^3.9.5",
+    "@artsy/fresnel": "^7.1.4",
     "@fontsource/montserrat": "^4.5.14",
     "@sentry/nextjs": "^7.102.0",
     "@sentry/node": "^7.102.0",
@@ -29,13 +30,14 @@
     "mobx": "^6.12.0",
     "mobx-react-lite": "^4.0.5",
     "modern-normalize": "^2.0.0",
-    "next": "^14.1.0",
+    "next": "^14.2.5",
     "radash": "^11.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "styled-components": "^5.3.11",
     "superjson": "^2.2.1",
     "tools": "workspace:*",
+    "ua-parser-js": "^1.0.38",
     "ui": "workspace:*",
     "use-debounce": "^9.0.4",
     "zod": "^3.22.4"
@@ -53,10 +55,11 @@
     "@types/react": "^18.2.14",
     "@types/react-dom": "^18.2.6",
     "@types/styled-components": "^5.1.26",
+    "@types/ua-parser-js": "^0.7.39",
     "@vchikalkin/eslint-config-awesome": "^1.1.6",
     "antd": "^5.14.2",
     "eslint": "^8.52.0",
-    "gql-sdl": "^1.0.0",
+    "gql-sdl": "^1.1.0",
     "jest": "^29.4.3",
     "jest-environment-jsdom": "^29.3.1",
     "msw": "^1.1.0",

apps/web/pages/_app.jsx

@@ -1,23 +1,23 @@
-/* eslint-disable no-console */
 import '../styles/fonts.css';
 import '../styles/globals.css';
 import '../styles/antd-fix.css';
 import '../styles/antd.min.css';
 import initializeQueryClient from '@/api/client';
 import initializeApollo from '@/apollo/client';
-import { Loading, Notification } from '@/Components/Common';
+import { Loading } from '@/Components/Common';
 import Layout from '@/Components/Layout';
 import { theme } from '@/config/ui';
-import { withBasePath } from '@/config/urls';
 import { usePageLoading } from '@/hooks';
+import { useServiceWorker } from '@/hooks/worker';
 import StoreProvider from '@/stores/Provider';
 import getColors from '@/styles/colors';
 import { GlobalStyle } from '@/styles/global-style';
+import { MediaContextProvider } from '@/styles/media';
 import { trpcClient } from '@/trpc/client';
 import { ApolloProvider } from '@apollo/client';
 import { QueryClientProvider } from '@tanstack/react-query';
 import Head from 'next/head';
-import { useEffect, useMemo } from 'react';
+import { useMemo } from 'react';
 import { ThemeProvider } from 'styled-components';
 import { Config as AntdConfig } from 'ui/elements';
 
@@ -29,25 +29,14 @@ const colorPrimary = getColors().COLOR_PRIMARY;
 
 function App({ Component, pageProps }) {
   const { initialApolloState, initialQueryState } = pageProps;
-  const apolloClient = useMemo(() => initializeApollo(initialApolloState), [initialApolloState]);
+  const apolloClient = useMemo(
+    () => initializeApollo(initialApolloState, {}),
+    [initialApolloState]
+  );
   const queryClient = useMemo(() => initializeQueryClient(initialQueryState), [initialQueryState]);
 
   const { loading } = usePageLoading();
-
+  useServiceWorker();
-  useEffect(() => {
-    if ('serviceWorker' in navigator) {
-      window.addEventListener('load', () => {
-        navigator.serviceWorker
-          .register(withBasePath('/service-worker.js'))
-          .then((registration) => {
-            console.log('Service Worker registered:', registration);
-          })
-          .catch((error) => {
-            console.error('Service Worker registration failed:', error);
-          });
-      });
-    }
-  }, []);
 
   return (
     <ThemeProvider theme={theme}>
@@ -71,11 +60,11 @@ function App({ Component, pageProps }) {
                 },
               }}
             >
-              <Notification>
+              <MediaContextProvider>
                 <Layout {...pageProps}>
                   {loading ? <Loading /> : <Component {...pageProps} />}
                 </Layout>
-              </Notification>
+              </MediaContextProvider>
             </AntdConfig>
           </QueryClientProvider>
         </ApolloProvider>

apps/web/pages/admin/cache.jsx

@@ -29,7 +29,7 @@ export async function getServerSideProps({ req }) {
   const { cookie = '' } = req.headers;
 
   const queryClient = new QueryClient();
-  const apolloClient = initializeApollo();
+  const apolloClient = initializeApollo(null, req.headers);
   const getUserType = makeGetUserType({ apolloClient, queryClient });
 
   try {

apps/web/pages/api/1c/transtax.ts

@@ -0,0 +1,38 @@
+import type { ResponseTransTax } from '@/api/1c/types';
+import { serverRuntimeConfigSchema } from '@/config/schema/runtime-config';
+import { withHandleError } from '@/utils/axios';
+import type { HttpError } from '@/utils/error';
+import axios from 'axios';
+import type { NextApiRequest, NextApiResponse } from 'next';
+import getConfig from 'next/config';
+
+const { serverRuntimeConfig } = getConfig();
+const { USERNAME_1C_TRANSTAX, PASSWORD_1C_TRANSTAX, URL_1C_TRANSTAX_DIRECT } =
+  serverRuntimeConfigSchema.parse(serverRuntimeConfig);
+
+export default function handler(req: NextApiRequest, res: NextApiResponse) {
+  const abortController = new AbortController();
+
+  req.on('close', () => {
+    abortController.abort();
+  });
+
+  const params = req.body as ResponseTransTax;
+
+  withHandleError(
+    axios.get<ResponseTransTax>(URL_1C_TRANSTAX_DIRECT, {
+      auth: {
+        password: PASSWORD_1C_TRANSTAX,
+        username: USERNAME_1C_TRANSTAX,
+      },
+      params,
+      signal: abortController.signal,
+    })
+  )
+    .then(({ data }) => res.json(data))
+    .catch((error) => {
+      const _err = error as HttpError;
+
+      return res.json({ message: _err.message });
+    });
+}

apps/web/pages/index.jsx

@@ -1,34 +1,23 @@
 import initializeApollo from '@/apollo/client';
-import * as Calculation from '@/Components/Calculation';
+import { Content } from '@/Components/Calculation';
 import { Error } from '@/Components/Common/Error';
 import * as hooks from '@/process/hooks';
-import { getPageTitle } from '@/utils/page';
 import { makeGetUserType } from '@/utils/user';
 import { dehydrate, QueryClient } from '@tanstack/react-query';
-import Head from 'next/head';
-
-function Content() {
-  hooks.useSentryScope();
-  hooks.useMainData();
-  hooks.useInsuranceData();
-  hooks.useReactions();
-
-  return (
-    <Calculation.Layout>
-      <Head>
-        <title>{getPageTitle()}</title>
-      </Head>
-      <Calculation.Form prune={['unlimited']} />
-      <Calculation.Settings />
-      <Calculation.Output />
-    </Calculation.Layout>
-  );
-}
 
 export default function Page(props) {
   if (props.statusCode !== 200) return <Error {...props} />;
 
-  return <Content />;
+  return (
+    <Content
+      initHooks={() => {
+        hooks.useSentryScope();
+        hooks.useMainData();
+        hooks.useInsuranceData();
+        hooks.useReactions();
+      }}
+    />
+  );
 }
 
 /** @type {import('next').GetServerSideProps} */
@@ -36,7 +25,7 @@ export async function getServerSideProps({ req }) {
   const { cookie = '' } = req.headers;
 
   const queryClient = new QueryClient();
-  const apolloClient = initializeApollo();
+  const apolloClient = initializeApollo(null, req.headers);
   const getUserType = makeGetUserType({ apolloClient, queryClient });
 
   try {

apps/web/pages/unlimited.jsx

@@ -1,43 +1,33 @@
 import initializeApollo from '@/apollo/client';
-import * as Calculation from '@/Components/Calculation';
+import { Content } from '@/Components/Calculation';
 import { Error } from '@/Components/Common/Error';
 import * as hooks from '@/process/hooks';
-import { getPageTitle } from '@/utils/page';
 import { makeGetUserType } from '@/utils/user';
 import { dehydrate, QueryClient } from '@tanstack/react-query';
-import Head from 'next/head';
 
-function Content() {
+export default function Page(props) {
+  if (props.statusCode !== 200) return <Error {...props} />;
+
+  return (
+    <Content
+      title="Без ограничений"
+      initHooks={() => {
         hooks.useSentryScope();
         hooks.useMainData();
         hooks.useGetUsers();
         hooks.useInsuranceData();
         hooks.useReactions();
-
+      }}
-  return (
+    />
-    <Calculation.Layout>
-      <Head>
-        <title>{getPageTitle('Без ограничений')}</title>
-      </Head>
-      <Calculation.Form />
-      <Calculation.Settings />
-      <Calculation.Output />
-    </Calculation.Layout>
   );
 }
 
-export default function Page(props) {
-  if (props.statusCode !== 200) return <Error {...props} />;
-
-  return <Content />;
-}
-
 /** @type {import('next').GetServerSideProps} */
 export async function getServerSideProps({ req }) {
   const { cookie = '' } = req.headers;
 
   const queryClient = new QueryClient();
-  const apolloClient = initializeApollo();
+  const apolloClient = initializeApollo(null, req.headers);
   const getUserType = makeGetUserType({ apolloClient, queryClient });
 
   try {

apps/web/process/add-product/get-kp-data.ts

@@ -1,14 +1,12 @@
 import type { GetQuoteInputData, GetQuoteProcessData } from '../load-kp/types';
-import initializeApollo from '@/apollo/client';
 import defaultValues from '@/config/default-values';
 import * as CRMTypes from '@/graphql/crm.types';
 
 export async function getKPData({
   values: { recalcWithRevision },
   quote,
+  ctx: { apolloClient },
 }: GetQuoteInputData): Promise<GetQuoteProcessData> {
-  const apolloClient = initializeApollo();
-
   const registration =
     quote?.evo_addproduct_types?.find((x) => x?.evo_product_type === 100_000_001)
       ?.evo_addproduct_typeid ?? defaultValues.registration;

apps/web/process/add-product/reactions.ts

@@ -7,10 +7,11 @@ import * as CRMTypes from '@/graphql/crm.types';
 import { getCurrentDateString } from '@/utils/date';
 import { normalizeOptions } from '@/utils/entity';
 import { debouncedReaction } from '@/utils/mobx';
-import { reaction, toJS } from 'mobx';
+import { reaction } from 'mobx';
+import { max } from 'radash';
 
 export default function reactions({ store, apolloClient }: ProcessContext) {
-  const { $calculation, $tables } = store;
+  const { $calculation, $process } = store;
 
   reaction(
     () => $calculation.$values.getValues(['leasingPeriod', 'leaseObjectType', 'maxMass']),
@@ -47,9 +48,9 @@ export default function reactions({ store, apolloClient }: ProcessContext) {
           )
       );
 
-      $calculation.element('selectTechnicalCard').setOptions(normalizeOptions(options));
-
       const currentTechnicalCardId = $calculation.element('selectTechnicalCard').getValue();
+
+      $calculation.element('selectTechnicalCard').setOptions(normalizeOptions(options));
       if (currentTechnicalCardId) {
         const {
           data: { evo_addproduct_type },
@@ -74,6 +75,54 @@ export default function reactions({ store, apolloClient }: ProcessContext) {
     }
   );
 
+  /**
+   * Устанавливаем самую дорогую техническую карточку по умолчанию первый раз при формировании списка карт
+   */
+  {
+    const dispose = reaction(
+      () => {
+        const technicalCards = $calculation.element('selectTechnicalCard').getOptions();
+        const isLoadKP = $process.has('LoadKP');
+
+        return { isLoadKP, technicalCards };
+      },
+      async ({ technicalCards, isLoadKP }) => {
+        if (isLoadKP) {
+          dispose();
+
+          return;
+        }
+
+        const currentTechnicalCard = $calculation.element('selectTechnicalCard').getValue();
+
+        if (technicalCards.length && !currentTechnicalCard) {
+          const evo_addproduct_types = await Promise.all(
+            technicalCards.map(async (x) => {
+              const {
+                data: { evo_addproduct_type },
+              } = await apolloClient.query({
+                query: CRMTypes.GetAddProductTypeDocument,
+                variables: { addproductTypeId: x.value },
+              });
+
+              return evo_addproduct_type;
+            })
+          );
+
+          const maxPriceTechnicalCard = max(evo_addproduct_types, (x) => x?.evo_graph_price ?? 0);
+
+          if (maxPriceTechnicalCard) {
+            $calculation
+              .element('selectTechnicalCard')
+              .setValue(maxPriceTechnicalCard?.evo_addproduct_typeid);
+          }
+
+          dispose();
+        }
+      }
+    );
+  }
+
   reaction(
     () => $calculation.$values.getValues(['leasingPeriod', 'leaseObjectType']),
     async ({ leasingPeriod, leaseObjectType }) => {
@@ -111,35 +160,35 @@ export default function reactions({ store, apolloClient }: ProcessContext) {
     }
   );
 
-  reaction(
+  // reaction(
-    () => {
+  //   () => {
-      const values = $calculation.$values.getValues(['leasingPeriod', 'leasingWithoutKasko']);
+  //     const values = $calculation.$values.getValues(['leasingPeriod', 'leasingWithoutKasko']);
-      const kaskoInsured = toJS($tables.insurance.row('kasko').getValue('insured'));
+  //     const kaskoInsured = toJS($tables.insurance.row('kasko').getValue('insured'));
-      const fingapInsured = toJS($tables.insurance.row('fingap').getValue('insured'));
+  //     const fingapInsured = toJS($tables.insurance.row('fingap').getValue('insured'));
 
-      return {
+  //     return {
-        ...values,
+  //       ...values,
-        fingapInsured,
+  //       fingapInsured,
-        kaskoInsured,
+  //       kaskoInsured,
-      };
+  //     };
-    },
+  //   },
-    ({ leasingPeriod, fingapInsured, kaskoInsured, leasingWithoutKasko }) => {
+  //   ({ leasingPeriod, fingapInsured, kaskoInsured, leasingWithoutKasko }) => {
-      if (
+  //     if (
-        leasingPeriod < 12 ||
+  //       leasingPeriod < 12 ||
-        leasingWithoutKasko ||
+  //       leasingWithoutKasko ||
-        kaskoInsured === 100_000_001 ||
+  //       kaskoInsured === 100_000_001 ||
-        (fingapInsured === 100_000_001 && leasingPeriod < 36)
+  //       (fingapInsured === 100_000_001 && leasingPeriod < 36)
-      ) {
+  //     ) {
-        $calculation.element('selectInsNSIB').resetValue().block();
+  //       $calculation.element('selectInsNSIB').resetValue().block();
-      } else {
+  //     } else {
-        $calculation.element('selectInsNSIB').unblock();
+  //       $calculation.element('selectInsNSIB').unblock();
-      }
+  //     }
-    },
+  //   },
-    {
+  //   {
-      delay: 10,
+  //     delay: 10,
-      fireImmediately: true,
+  //     fireImmediately: true,
-    }
+  //   }
-  );
+  // );
 
   debouncedReaction(
     () =>

apps/web/process/bonuses/validation.ts

@@ -10,8 +10,17 @@ export function createValidationSchema(context: ValidationContext) {
   return ValuesSchema.pick({ product: true, saleBonus: true }).superRefine(
     async ({ product, saleBonus }, ctx) => {
       const coefficient = await getCoefficient(product);
+      const minBonus = (coefficient?.evo_correction_coefficient || 0) * 100;
       const maxBonus = (coefficient?.evo_sot_coefficient || 0) * 100;
 
+      if (round(saleBonus, 2) < round(minBonus, 2)) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: 'Бонус не может быть ниже установленного по СОТ',
+          path: ['tbxSaleBonus'],
+        });
+      }
+
       if (round(saleBonus, 2) > round(maxBonus, 2)) {
         ctx.addIssue({
           code: z.ZodIssueCode.custom,

apps/web/process/calculate/reactions/common.ts

@@ -1,4 +1,5 @@
 import helper from '../lib/helper';
+import { IRR_THRESHOLD } from '@/constants/values';
 import type { ProcessContext } from '@/process/types';
 import { disposableReaction } from '@/utils/mobx';
 import { comparer, reaction } from 'mobx';
@@ -31,7 +32,8 @@ export default function reactions({ store, apolloClient }: ProcessContext) {
 
   const { getIrr } = helper({ apolloClient });
 
-  reaction(
+  disposableReaction(
+    () => $process.has('LoadKP'),
     () => $calculation.$values.getValues(['product', 'tarif', 'bonusCoefficient']),
     async (values) => {
       const { min, max } = await getIrr(values);
@@ -40,6 +42,19 @@ export default function reactions({ store, apolloClient }: ProcessContext) {
     }
   );
 
+  // костыль
+  disposableReaction(
+    () =>
+      $process.has('LoadKP') ||
+      $calculation.element('radioLastPaymentRule').getValue() === 100_000_002,
+    () => $calculation.element('labelIrrInfo').getValue(),
+    ({ min }) => {
+      if ($calculation.element('radioLastPaymentRule').getValue() === 100_000_002) return;
+
+      $calculation.element('tbxIRR_Perc').setValue(min + IRR_THRESHOLD);
+    }
+  );
+
   disposableReaction(
     () => $process.has('Calculate') || $process.has('CreateKP'),
     () => {

apps/web/process/configurator/get-kp-data.ts

@@ -2,7 +2,6 @@
 /* eslint-disable complexity */
 import type { GetQuoteInputData, GetQuoteProcessData } from '../load-kp/types';
 import helper from './lib/helper';
-import initializeApollo from '@/apollo/client';
 import defaultValues from '@/config/default-values';
 import calculateHelper from '@/process/calculate/lib/helper';
 import { getKPData as getKPDataPrice } from '@/process/price/get-kp-data';
@@ -13,15 +12,16 @@ import { normalizeOptions } from '@/utils/entity';
 export async function getKPData({
   values,
   quote,
+  ctx,
 }: GetQuoteInputData): Promise<GetQuoteProcessData> {
+  const { apolloClient } = ctx;
   const { recalcWithRevision } = values;
-  const apolloClient = initializeApollo();
 
   const leasingPeriod = recalcWithRevision
     ? Math.min(quote?.evo_period ?? 0, quote?.evo_accept_period ?? 0)
     : quote?.evo_period ?? 0;
 
-  const { getTarifs, getRates, getPriceChange } = helper({ apolloClient });
+  const { getTarifs, getRates, getPriceChange, getCreditRate } = helper({ apolloClient });
 
   let tarif = defaultValues.tarif;
   let evo_tarif: unknown = null;
@@ -61,8 +61,8 @@ export async function getKPData({
   let minPriceChange = quote?.evo_min_change_price ?? defaultValues.minPriceChange;
 
   if (!recalcWithRevision) {
-    const kpDataPrice = await getKPDataPrice({ quote, values });
+    const kpDataPrice = await getKPDataPrice({ ctx, quote, values });
-    const kpDataSubsidy = await getKPDataSubsidy({ quote, values });
+    const kpDataSubsidy = await getKPDataSubsidy({ ctx, quote, values });
 
     const supplierCurrency = kpDataPrice.values?.supplierCurrency ?? defaultValues.supplierCurrency;
     const leaseObjectPrice = kpDataPrice.values?.leaseObjectPrice ?? defaultValues.leaseObjectPrice;
@@ -106,6 +106,8 @@ export async function getKPData({
     tarif,
   });
 
+  const creditRate = await getCreditRate({ rate: evo_rate?.evo_rateid ?? null });
+
   return {
     options: {
       selectTarif: evo_tarif ? normalizeOptions([evo_tarif]) : [],
@@ -113,6 +115,7 @@ export async function getKPData({
     values: {
       IRR_Perc: quote?.evo_msfo_irr ?? defaultValues.IRR_Perc,
       clientType: quote?.evo_client_typeid,
+      creditRate,
       floatingRate: quote?.evo_floating_rate ?? false,
       irrInfo,
       maxPriceChange,

apps/web/process/configurator/lib/helper.ts

@@ -1,5 +1,6 @@
 /* eslint-disable sonarjs/cognitive-complexity */
 import defaultValues from '@/config/default-values';
+import { RATE } from '@/constants/values';
 import * as CRMTypes from '@/graphql/crm.types';
 import type { ProcessContext } from '@/process/types';
 import type { CalculationValues } from '@/stores/calculation/values/types';
@@ -22,6 +23,8 @@ type GetTarifInputValues = Pick<
 
 type GetRatesInputValues = Pick<CalculationValues, 'tarif'>;
 
+type GetCreditRateInputValues = Pick<CalculationValues, 'rate'>;
+
 type GetPriceChangeInputValues = Pick<
   CalculationValues,
   | 'addEquipmentPrice'
@@ -34,6 +37,22 @@ type GetPriceChangeInputValues = Pick<
 
 export default function helper({ apolloClient }: Pick<ProcessContext, 'apolloClient'>) {
   return {
+    async getCreditRate({ rate: rateId }: GetCreditRateInputValues) {
+      if (!rateId) return RATE;
+
+      const {
+        data: { evo_rate },
+      } = await apolloClient.query({
+        fetchPolicy: 'network-only',
+        query: CRMTypes.GetRateDocument,
+        variables: {
+          rateId,
+        },
+      });
+
+      return evo_rate?.evo_base_rate ?? RATE;
+    },
+
     async getPriceChange({
       discountRub,
       importProgramSum,
@@ -106,7 +125,7 @@ export default function helper({ apolloClient }: Pick<ProcessContext, 'apolloCli
       });
 
       const filtered_evo_tarif_evo_rates =
-        evo_tarif?.evo_rates?.filter((x) => x?.evo_type === 100_000_000) || [];
+        evo_tarif?.evo_rates?.filter((x) => x?.evo_type === 100_000_000 && x.statecode === 0) || [];
 
       const evo_tarif_evo_rate =
         evo_tarif?.evo_rates &&

apps/web/process/configurator/reactions/values.ts

@@ -10,7 +10,7 @@ export default function valuesReactions({ store, apolloClient, trpcClient }: Pro
   let abortController = new AbortController();
   const { $calculation, $process } = store;
 
-  const { getRates, getPriceChange } = helper({ apolloClient });
+  const { getRates, getPriceChange, getCreditRate } = helper({ apolloClient });
 
   disposableDebouncedReaction(
     () => $process.has('LoadKP'),
@@ -123,32 +123,13 @@ export default function valuesReactions({ store, apolloClient, trpcClient }: Pro
     }
   );
 
-  reaction(
+  disposableReaction(
+    () => $process.has('LoadKP'),
     () => $calculation.element('selectRate').getValue(),
-    async (rateId) => {
+    async (rate) => {
-      if (!rateId) {
+      const creditRate = await getCreditRate({ rate });
-        $calculation.element('tbxCreditRate').resetValue();
 
-        return;
+      $calculation.element('tbxCreditRate').setValue(creditRate);
-      }
-
-      const {
-        data: { evo_rate },
-      } = await apolloClient.query({
-        fetchPolicy: 'network-only',
-        query: CRMTypes.GetRateDocument,
-        variables: {
-          rateId,
-        },
-      });
-
-      if (evo_rate?.evo_base_rate === null || evo_rate?.evo_base_rate === undefined) {
-        $calculation.element('tbxCreditRate').resetValue();
-
-        return;
-      }
-
-      $calculation.element('tbxCreditRate').setValue(evo_rate?.evo_base_rate);
     }
   );
 

apps/web/process/create-kp/get-kp-data.ts

@@ -16,6 +16,7 @@ export async function getKPData({ quote }: GetQuoteInputData): Promise<GetQuoteP
       quoteName: quote?.evo_contact_name ?? defaultValues.quoteName,
       quotePriceWithFullVAT: quote?.evo_full_nds_price ?? defaultValues.quotePriceWithFullVAT,
       quoteRedemptionGraph: quote?.evo_redemption_graph ?? defaultValues.quoteRedemptionGraph,
+      quoteShowAcceptLimit: quote?.evo_accept_limit_quote ?? defaultValues.quoteShowAcceptLimit,
       registrationQuote: quote?.evo_registration_quote ?? defaultValues.registrationQuote,
       showFinGAP: quote?.evo_fingap_quote ?? defaultValues.showFinGAP,
       technicalCardQuote: quote?.evo_card_quote ?? defaultValues.technicalCardQuote,

apps/web/process/elt/get-kp-data.ts

@@ -1,28 +1,37 @@
 import type { GetQuoteInputData, GetQuoteProcessData } from '../load-kp/types';
+import { defaultRow } from '@/stores/tables/elt/default-values';
 
 export async function getKPData({ quote }: GetQuoteInputData): Promise<GetQuoteProcessData> {
   const elt: NonNullable<GetQuoteProcessData['elt']> = { kasko: undefined, osago: undefined };
 
   if (
     quote?.evo_kasko_accountid &&
-    quote?.evo_id_elt_kasko &&
+    ((quote?.evo_id_elt_kasko && quote?.evo_id_kasko_calc) ||
-    quote?.evo_id_kasko_calc &&
+      quote.evo_kasko_insurance_rulesidData?.evo_id) &&
     quote?.evo_kasko_price &&
     quote?.evo_franchise !== null
   ) {
     elt.kasko = {
+      insuranceCondition:
+        quote.evo_kasko_insurance_rulesidData?.evo_id ?? defaultRow.insuranceCondition,
       key: quote?.evo_kasko_accountid,
-      requestId: quote?.evo_id_elt_kasko,
+      requestId: quote?.evo_id_elt_kasko ?? defaultRow.requestId,
-      skCalcId: quote?.evo_id_kasko_calc,
+      skCalcId: quote?.evo_id_kasko_calc ?? defaultRow.skCalcId,
       sum: quote?.evo_kasko_price,
       totalFranchise: quote?.evo_franchise,
     };
   }
 
-  if (quote?.evo_osago_accountid && quote?.evo_id_elt_osago && quote?.evo_osago_price) {
+  if (
+    quote?.evo_osago_accountid &&
+    (quote?.evo_id_elt_osago || quote.evo_osago_insurance_rulesiddData?.evo_id) &&
+    quote?.evo_osago_price
+  ) {
     elt.osago = {
+      insuranceCondition:
+        quote.evo_osago_insurance_rulesiddData?.evo_id ?? defaultRow.insuranceCondition,
       key: quote?.evo_osago_accountid,
-      numCalc: quote?.evo_id_elt_osago,
+      numCalc: quote?.evo_id_elt_osago ?? defaultRow.numCalc,
       sum: quote?.evo_osago_price,
     };
   }

apps/web/process/elt/lib/helper.ts

@@ -30,14 +30,19 @@ export default function helper({
         ({ evo_leasingobject_type } = data);
       }
 
+      // const leaseObjectCategory = $calculation.element('selectLeaseObjectCategory').getValue();
+
       return {
         kasko: (accounts
-          ?.filter((x) =>
+          ?.filter(
+            (x) =>
               x?.evo_type_ins_policy?.includes(100_000_000) &&
-            evo_leasingobject_type?.evo_id &&
+              // leaseObjectCategory &&
-            ['6', '9', '10'].includes(evo_leasingobject_type?.evo_id)
+              // x.evo_kasko_category?.includes(leaseObjectCategory) &&
-              ? Boolean(x.evo_id_elt_smr)
+              (evo_leasingobject_type?.evo_id &&
-              : Boolean(x?.evo_id_elt)
+              ['6', '9', '10'].includes(evo_leasingobject_type.evo_id)
+                ? x?.evo_id_elt_smr
+                : x?.evo_id_elt)
           )
           .map((x) => ({
             ...defaultRow,
@@ -53,6 +58,8 @@ export default function helper({
           ?.filter(
             (x) =>
               x?.evo_type_ins_policy?.includes(100_000_001) &&
+              // leaseObjectCategory &&
+              // x.evo_osago_category?.includes(leaseObjectCategory) &&
               (x?.evo_id_elt_osago || x.evo_osago_id)
           )
           .map((x) => ({

apps/web/process/elt/lib/request.ts

@@ -1,14 +1,14 @@
 /* eslint-disable sonarjs/cognitive-complexity */
 /* eslint-disable complexity */
-import type { Row } from '../types';
 import type { RequestEltKasko, RequestEltOsago } from '@/api/elt/types';
+import type { Row } from '@/Components/Calculation/Form/ELT/types';
 import * as CRMTypes from '@/graphql/crm.types';
 import type { ProcessContext } from '@/process/types';
 import { getCurrentDateString } from '@/utils/date';
 import dayjs from 'dayjs';
 import { first, sort } from 'radash';
 
-export async function makeOwnOsagoRequest(
+export async function ownOsagoRequest(
   { store, apolloClient }: Pick<ProcessContext, 'apolloClient' | 'store'>,
   row: Row
 ): Promise<NonNullable<CRMTypes.GetOsagoAddproductTypesQuery['evo_addproduct_types']>[number]> {
@@ -471,7 +471,8 @@ export async function makeEltKaskoRequest(
   let selfIgnitionSpecified = false;
   if (
     leaseObjectCategory === 100_000_002 ||
-    (evo_leasingobject_type?.evo_id && ['6', '9', '10'].includes(evo_leasingobject_type?.evo_id))
+    (evo_leasingobject_type?.evo_id &&
+      ['6', '8', '9', '10'].includes(evo_leasingobject_type?.evo_id))
   ) {
     notConfirmedGlassesDamages = 3;
     notConfirmedGlassesDamagesSpecified = true;
@@ -617,10 +618,26 @@ export async function makeEltKaskoRequest(
       }
     }
 
-  const classification =
+  let classification = '11606';
-    leaseObjectCategory && [100_000_002, 100_000_003, 100_000_004].includes(leaseObjectCategory)
+
-      ? '11635'
+  switch (evo_leasingobject_type?.evo_id) {
-      : '0';
+    case '7': {
+      classification = '11611';
+      break;
+    }
+    case '3': {
+      classification = '11607';
+      break;
+    }
+    case '8': {
+      classification = '11650';
+      break;
+    }
+    default: {
+      classification = '11606';
+      break;
+    }
+  }
 
   let INN = '';
   const leadid = $calculation.element('selectLead').getValue();

apps/web/process/elt/lib/response.ts

@@ -0,0 +1,284 @@
+/* eslint-disable sonarjs/cognitive-complexity */
+/* eslint-disable complexity */
+import type { ownOsagoRequest } from './request';
+import { getInsuranceRule } from './tools';
+import type { BaseConvertResponseInput } from './types';
+import type * as ELT from '@/api/elt/types';
+import type { Row } from '@/Components/Calculation/Form/ELT/types';
+import { MAX_FRANCHISE, MAX_INSURANCE, MIN_INSURANCE } from '@/constants/values';
+import * as CRMTypes from '@/graphql/crm.types';
+import { defaultRow } from '@/stores/tables/elt/default-values';
+import { round } from 'tools';
+
+type ConvertEltOsagoResponseInput = BaseConvertResponseInput & {
+  response: ELT.ResponseEltOsago;
+};
+
+export async function convertEltOsagoResponse(input: ConvertEltOsagoResponseInput): Promise<Row> {
+  const { context, response, row } = input;
+  const { store } = context;
+
+  const { premiumSum = 0 } = response;
+  let { message, numCalc, skCalcId, error } = response;
+  let sum = premiumSum;
+
+  const { $calculation } = store;
+
+  const cost =
+    $calculation.$values.getValue('plPriceRub') -
+    $calculation.$values.getValue('discountRub') -
+    $calculation.$values.getValue('importProgramSum') +
+    $calculation.$values.getValue('addEquipmentPrice');
+
+  const selectedRule = await getInsuranceRule(input, { cost, riskType: 'osago' });
+
+  const insuranceCondition = selectedRule?.evo_id ?? null;
+
+  if (selectedRule) {
+    const rule_evo_discount = selectedRule.evo_discount ?? 0;
+
+    switch (selectedRule.evo_rules_type) {
+      // "не выводить результат расчета"
+      case 100_000_000: {
+        sum = 0;
+        numCalc = Number.parseInt(defaultRow.numCalc, 2);
+        skCalcId = defaultRow.skCalcId;
+        if (selectedRule.evo_message) message = selectedRule.evo_message;
+        break;
+      }
+
+      // "проверка на мин.тариф"
+      case 100_000_001: {
+        const newSum = round((sum / cost) * 100, 2);
+        if (newSum < rule_evo_discount) {
+          sum = 0;
+          numCalc = Number.parseInt(defaultRow.numCalc, 2);
+          skCalcId = defaultRow.skCalcId;
+          if (selectedRule.evo_message) message = selectedRule.evo_message;
+        }
+        break;
+      }
+
+      // "скидка за счет КВ"
+      case 100_000_002: {
+        sum = (sum * (100 - rule_evo_discount)) / 100;
+        numCalc = Number.parseInt(defaultRow.numCalc, 2);
+        skCalcId = defaultRow.skCalcId;
+        if (selectedRule.evo_message) message = selectedRule.evo_message;
+        break;
+      }
+
+      // "акционный тариф"
+      case 100_000_003: {
+        sum = (rule_evo_discount / 100) * cost;
+        numCalc = Number.parseInt(defaultRow.numCalc, 2);
+        skCalcId = defaultRow.skCalcId;
+        if (selectedRule.evo_message) message = selectedRule.evo_message;
+        break;
+      }
+    }
+  }
+
+  if (sum > MAX_INSURANCE) {
+    error ||= `Сумма по страховке превышает максимально допустимое значение по стоимости ОСАГО: ${Intl.NumberFormat(
+      'ru',
+      {
+        currency: 'RUB',
+        style: 'currency',
+      }
+    ).format(MAX_INSURANCE)}`;
+  }
+  if (sum < MIN_INSURANCE) {
+    error ||= `Сумма по страховке не должна быть меньше допустимого значения по стоимости ОСАГО: ${Intl.NumberFormat(
+      'ru',
+      {
+        currency: 'RUB',
+        style: 'currency',
+      }
+    ).format(MIN_INSURANCE)}`;
+  }
+
+  return {
+    ...row,
+    insuranceCondition,
+    message: error || message,
+    numCalc: `${numCalc}`,
+    skCalcId,
+    status: error ? 'error' : null,
+    sum,
+  };
+}
+
+type ResponseOwnOsago = Awaited<ReturnType<typeof ownOsagoRequest>>;
+
+export function convertOwnOsagoResult(result: ResponseOwnOsago | undefined, row: Row): Row {
+  if (!result) {
+    return {
+      ...row,
+      message:
+        'Для получения расчета ОСАГО следует использовать калькулятор ЭЛТ или Индивидуальный запрос',
+      numCalc: '',
+      skCalcId: '',
+      status: 'error',
+      sum: 0,
+      totalFranchise: 0,
+    };
+  }
+
+  if (!result.evo_id) {
+    return {
+      ...row,
+      message: 'Сервер не вернул идентификатор страховки evo_id',
+      numCalc: '',
+      skCalcId: '',
+      status: 'error',
+      sum: result.evo_graph_price_withoutnds || 0,
+    };
+  }
+
+  return {
+    ...row,
+    message: null,
+    numCalc: result.evo_id,
+    status: null,
+    sum: result.evo_graph_price_withoutnds || 0,
+  };
+}
+
+type ConvertEltKaskoResponseInput = BaseConvertResponseInput & {
+  response: ELT.ResponseEltKasko;
+};
+
+export async function convertEltKaskoResponse(input: ConvertEltKaskoResponseInput): Promise<Row> {
+  const { context, response, row } = input;
+  const { apolloClient, store } = context;
+
+  const { kaskoSum = 0, paymentPeriods } = response;
+  let { message, requestId, skCalcId, totalFranchise = 0, error } = response;
+
+  const { $calculation } = store;
+  const leasingPeriod = $calculation.element('tbxLeasingPeriod').getValue();
+  let sum = leasingPeriod <= 16 ? kaskoSum : paymentPeriods?.[0]?.kaskoSum || 0;
+
+  const {
+    data: { account: insuranceCompany },
+  } = await apolloClient.query({
+    query: CRMTypes.GetInsuranceCompanyDocument,
+    variables: { accountId: row.key },
+  });
+
+  if (
+    insuranceCompany?.evo_kasko_fact_part !== null &&
+    insuranceCompany?.evo_kasko_plan_part !== undefined &&
+    insuranceCompany?.evo_kasko_plan_part !== null &&
+    insuranceCompany?.evo_kasko_plan_part !== undefined &&
+    insuranceCompany?.evo_kasko_fact_part > insuranceCompany?.evo_kasko_plan_part
+  ) {
+    requestId = defaultRow.requestId;
+    skCalcId = defaultRow.skCalcId;
+    sum = defaultRow.sum;
+    totalFranchise = defaultRow.totalFranchise;
+    error = 'Расчет закрыт';
+  }
+
+  const cost =
+    $calculation.$values.getValue('plPriceRub') -
+    $calculation.$values.getValue('discountRub') -
+    $calculation.$values.getValue('importProgramSum') +
+    $calculation.$values.getValue('addEquipmentPrice');
+
+  const selectedRule = await getInsuranceRule(input, { cost, riskType: 'kasko' });
+
+  const insuranceCondition = selectedRule?.evo_id ?? null;
+
+  if (selectedRule) {
+    const rule_evo_discount = selectedRule.evo_discount ?? 0;
+
+    switch (selectedRule.evo_rules_type) {
+      // "не выводить результат расчета"
+      case 100_000_000: {
+        sum = 0;
+        requestId = defaultRow.requestId;
+        skCalcId = defaultRow.skCalcId;
+        if (selectedRule.evo_message) message = selectedRule.evo_message;
+        totalFranchise = 0;
+        break;
+      }
+
+      // "проверка на мин.тариф"
+      case 100_000_001: {
+        const newSum = round((sum / cost) * 100, 2);
+        if (newSum < rule_evo_discount) {
+          sum = 0;
+          requestId = defaultRow.requestId;
+          skCalcId = defaultRow.skCalcId;
+          if (selectedRule.evo_message) message = selectedRule.evo_message;
+          totalFranchise = 0;
+        }
+        break;
+      }
+
+      // "скидка за счет КВ"
+      case 100_000_002: {
+        sum = (sum * (100 - rule_evo_discount)) / 100;
+        requestId = defaultRow.requestId;
+        skCalcId = defaultRow.skCalcId;
+        if (selectedRule.evo_message) message = selectedRule.evo_message;
+        totalFranchise = 0;
+        break;
+      }
+
+      // "акционный тариф"
+      case 100_000_003: {
+        sum = (rule_evo_discount / 100) * cost;
+        requestId = defaultRow.requestId;
+        skCalcId = defaultRow.skCalcId;
+        if (selectedRule.evo_message) message = selectedRule.evo_message;
+        totalFranchise = 0;
+        break;
+      }
+    }
+  }
+
+  if (totalFranchise > MAX_FRANCHISE) {
+    error ||= `Франшиза по страховке превышает максимально допустимое значение: ${Intl.NumberFormat(
+      'ru',
+      {
+        currency: 'RUB',
+        style: 'currency',
+      }
+    ).format(MAX_FRANCHISE)}`;
+  }
+
+  if (sum > MAX_INSURANCE) {
+    error ||= `Сумма по страховке превышает максимально допустимое значение по стоимости КАСКО: ${Intl.NumberFormat(
+      'ru',
+      {
+        currency: 'RUB',
+        style: 'currency',
+      }
+    ).format(MAX_INSURANCE)}`;
+  }
+
+  if (sum < MIN_INSURANCE) {
+    error ||= `Сумма по страховке не должна быть меньше допустимого значения по стоимости КАСКО: ${Intl.NumberFormat(
+      'ru',
+      {
+        currency: 'RUB',
+        style: 'currency',
+      }
+    ).format(MIN_INSURANCE)}`;
+  }
+
+  return {
+    ...row,
+    insuranceCondition,
+    message: error || message,
+    numCalc: '0',
+    requestId,
+    skCalcId,
+    status: error ? 'error' : null,
+    sum,
+    totalFranchise,
+  };
+}

apps/web/process/elt/lib/tools.ts

@@ -0,0 +1,142 @@
+/* eslint-disable sonarjs/cognitive-complexity */
+/* eslint-disable complexity */
+import type { BaseConvertResponseInput } from './types';
+import * as CRMTypes from '@/graphql/crm.types';
+import { getCurrentDateString } from '@/utils/date';
+import dayjs from 'dayjs';
+import { sort } from 'radash';
+
+type GetInsuranceConditionParams = {
+  cost: number;
+  riskType: 'osago' | 'kasko';
+};
+
+type Rule =
+  | NonNullable<CRMTypes.GetEltInsuranceRulesQuery['evo_insurance_ruleses']>[number]
+  | undefined;
+
+export async function getInsuranceRule(
+  input: BaseConvertResponseInput,
+  { cost, riskType }: GetInsuranceConditionParams
+) {
+  const { context, row } = input;
+  const { apolloClient, store } = context;
+
+  const { $calculation } = store;
+  const leasingPeriod = $calculation.element('tbxLeasingPeriod').getValue();
+
+  const currentDate = getCurrentDateString();
+
+  const leaseObjectCategory = $calculation.element('selectLeaseObjectCategory').getValue();
+  const leaseObjectYear = $calculation.element('tbxLeaseObjectYear').getValue();
+  const leaseObjectMotorPower = $calculation.element('tbxLeaseObjectMotorPower').getValue();
+  const engineType = $calculation.element('selectEngineType').getValue();
+  const tbxMileage = $calculation.element('tbxMileage').getValue();
+  const brand = $calculation.element('selectBrand').getValue();
+  const model = $calculation.element('selectModel').getValue();
+  const selectLeaseObjectUseFor = $calculation.element('selectLeaseObjectUseFor').getValue();
+  const legalClientRegion = $calculation.element('selectLegalClientRegion').getValue();
+  const dealerPerson = $calculation.element('selectDealerPerson').getValue();
+  const cbxLeaseObjectUsed = $calculation.element('cbxLeaseObjectUsed').getValue();
+
+  let lead: CRMTypes.GetLeadQuery['lead'] = null;
+  const leadid = $calculation.element('selectLead').getValue();
+  if (leadid) {
+    const { data } = await apolloClient.query({
+      query: CRMTypes.GetLeadDocument,
+      variables: { leadid },
+    });
+    ({ lead } = data);
+  }
+  const insuranceOPF = lead?.evo_inn?.length === 12 ? 100_000_001 : 100_000_000;
+
+  const {
+    data: { evo_insurance_ruleses },
+  } = await apolloClient.query({
+    query: CRMTypes.GetEltInsuranceRulesDocument,
+    variables: {
+      currentDate,
+    },
+  });
+
+  const {
+    data: { account: insuranceCompany },
+  } = await apolloClient.query({
+    query: CRMTypes.GetInsuranceCompanyDocument,
+    variables: { accountId: row.key },
+  });
+
+  const filteredRules = evo_insurance_ruleses?.filter(
+    (rule) =>
+      rule &&
+      rule.evo_insurer_accountid === insuranceCompany?.accountid &&
+      (riskType === 'kasko' ? rule.evo_risk === 100_000_000 : rule.evo_risk === 100_000_003) &&
+      leaseObjectCategory &&
+      rule.evo_category?.includes(leaseObjectCategory) &&
+      rule.evo_min_period !== null &&
+      rule.evo_max_period !== null &&
+      leasingPeriod !== null &&
+      rule.evo_min_period <= leasingPeriod &&
+      rule.evo_max_period >= leasingPeriod &&
+      (rule.evo_object_type === 100_000_000 ||
+        (rule.evo_object_type === 100_000_001 && cbxLeaseObjectUsed === false) ||
+        (rule.evo_object_type === 100_000_002 && cbxLeaseObjectUsed === true)) &&
+      selectLeaseObjectUseFor &&
+      rule.evo_use_for?.includes(selectLeaseObjectUseFor) &&
+      rule.evo_min_price !== null &&
+      rule.evo_max_price !== null &&
+      cost !== null &&
+      rule.evo_min_price <= cost &&
+      rule.evo_max_price >= cost &&
+      rule.evo_min_year !== null &&
+      rule.evo_max_year !== null &&
+      leaseObjectYear !== null &&
+      rule.evo_min_year <= leaseObjectYear &&
+      rule.evo_max_year >= leaseObjectYear &&
+      rule.evo_min_power !== null &&
+      rule.evo_max_power !== null &&
+      leaseObjectMotorPower !== null &&
+      rule.evo_min_power <= leaseObjectMotorPower &&
+      rule.evo_max_power >= leaseObjectMotorPower &&
+      engineType &&
+      rule.evo_enginie_type?.includes(engineType) &&
+      rule.evo_opf === insuranceOPF &&
+      rule.evo_min_mileage !== null &&
+      rule.evo_max_mileage !== null &&
+      tbxMileage !== null &&
+      rule.evo_min_mileage <= tbxMileage &&
+      rule.evo_max_mileage >= tbxMileage &&
+      (rule.evo_brand === 100_000_000 ||
+        (rule.evo_brand === 100_000_001 &&
+          rule.evo_brands?.some((x) => x?.evo_brandid === brand)) ||
+        (rule.evo_brand === 100_000_002 &&
+          !rule.evo_brands?.some((x) => x?.evo_brandid === brand))) &&
+      (rule.evo_model === 100_000_000 ||
+        (rule.evo_model === 100_000_001 &&
+          rule.evo_models?.some((x) => x?.evo_modelid === model)) ||
+        (rule.evo_model === 100_000_002 &&
+          !rule.evo_models?.some((x) => x?.evo_modelid === model))) &&
+      (rule.evo_region === 100_000_000 ||
+        (rule.evo_region === 100_000_001 &&
+          rule.evo_regions?.some((x) => x?.evo_regionid === legalClientRegion)) ||
+        (rule.evo_region === 100_000_002 &&
+          !rule.evo_regions?.some((x) => x?.evo_regionid === legalClientRegion))) &&
+      (rule.evo_dealer === 100_000_000 ||
+        (rule.evo_dealer === 100_000_001 &&
+          rule.accounts?.some((x) => x?.accountid === dealerPerson)) ||
+        (rule.evo_dealer === 100_000_002 &&
+          !rule.accounts?.some((x) => x?.accountid === dealerPerson)))
+  );
+
+  // Обработка найденных записей по приоритету
+  const sortedRules = filteredRules
+    ? sort(filteredRules, (x) => dayjs(x?.evo_datefrom).date(), true)
+    : [];
+
+  const priorities = [100_000_000, 100_000_003, 100_000_001, 100_000_002];
+
+  return priorities.reduce(
+    (found, priority) => found || sortedRules.find((rule) => rule?.evo_rules_type === priority),
+    null as Rule
+  );
+}

apps/web/process/elt/lib/types.ts

@@ -0,0 +1,7 @@
+import type { Row } from '@/Components/Calculation/Form/ELT/types';
+import type { ProcessContext } from '@/process/types';
+
+export type BaseConvertResponseInput = {
+  context: Pick<ProcessContext, 'apolloClient' | 'store'>;
+  row: Row;
+};

apps/web/process/elt/validation.ts

@@ -259,6 +259,8 @@ export function createValidationSchema({ apolloClient }: ValidationContext) {
       }
 
       let okved: string | null | undefined;
+      let evo_inn: string | null | undefined;
+
       if (leadid) {
         const {
           data: { lead },
@@ -268,6 +270,7 @@ export function createValidationSchema({ apolloClient }: ValidationContext) {
         });
 
         okved = lead?.accountidData?.evo_okved;
+        evo_inn = lead?.evo_inn;
       }
 
       if (!okved && opportunityid) {
@@ -302,6 +305,14 @@ export function createValidationSchema({ apolloClient }: ValidationContext) {
           path: ['eltKasko', 'eltOsago'],
         });
       }
+
+      if (!evo_inn) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: 'ИНН в интересе не заполнен',
+          path: ['eltKasko', 'eltOsago'],
+        });
+      }
     }
   );
 }

apps/web/process/fingap/get-kp-data.ts

@@ -1,17 +1,18 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 import type { GetQuoteInputData, GetQuoteProcessData } from '../load-kp/types';
 import helper from './lib/helper';
-import initializeApollo from '@/apollo/client';
 import defaultValues from '@/config/default-values';
 import { getKPData as getKPDataPayments } from '@/process/payments/get-kp-data';
 import { getKPData as getKPDataPrice } from '@/process/price/get-kp-data';
 import { createCurrencyUtility } from '@/utils/currency';
-import { QueryClient } from '@tanstack/react-query';
 
 export async function getKPData({
   quote,
   values,
+  ctx,
 }: GetQuoteInputData): Promise<GetQuoteProcessData> {
+  const { apolloClient, queryClient } = ctx;
+
   if (!quote?.evo_fingap_accountid) {
     return {
       fingap: {
@@ -21,13 +22,10 @@ export async function getKPData({
     };
   }
 
-  const apolloClient = initializeApollo();
-  const queryClient = new QueryClient();
-
   const { getFingapRisks } = helper({ apolloClient, queryClient });
 
-  const kpDataPrice = await getKPDataPrice({ quote, values });
+  const kpDataPrice = await getKPDataPrice({ ctx, quote, values });
-  const kpDataPayments = await getKPDataPayments({ quote, values });
+  const kpDataPayments = await getKPDataPayments({ ctx, quote, values });
 
   const leaseObjectPrice = kpDataPrice.values?.leaseObjectPrice ?? defaultValues.leaseObjectPrice;
   const firstPaymentRub = kpDataPrice.values?.firstPaymentRub ?? defaultValues.firstPaymentRub;

apps/web/process/fingap/reactions/index.ts

@@ -1 +1,2 @@
 export { default as common } from './common';
+export { default as init } from './init';

apps/web/process/fingap/reactions/init.ts

@@ -0,0 +1,34 @@
+import type { ProcessContext } from '@/process/types';
+import { when } from 'mobx';
+
+export default function reactions({ store }: ProcessContext) {
+  const { $tables } = store;
+
+  /**
+   * Устанавливаем СК фингап по умолчанию при загрузке страницы
+   */
+  when(() => {
+    const finGAPInsuranceCompanies = $tables.insurance.row('fingap').getOptions('insuranceCompany');
+    if (finGAPInsuranceCompanies.length) {
+      $tables.insurance
+        .row('fingap')
+        .setValue('insuranceCompany', finGAPInsuranceCompanies[0]?.value)
+        .setValue('insured', 100_000_001);
+    }
+
+    return Boolean(finGAPInsuranceCompanies.length);
+  });
+
+  /**
+   * Устанавливаем все риски ФинГАП по умолчанию при загрузке страницы
+   */
+  when(() => {
+    const { risks } = $tables.fingap;
+
+    if (risks.length) {
+      $tables.fingap.setSelectedKeys(risks.map((x) => x.key));
+    }
+
+    return Boolean(risks.length);
+  });
+}

apps/web/process/gibdd/get-kp-data.ts

@@ -1,17 +1,15 @@
 /* eslint-disable sonarjs/cognitive-complexity */
 import type { GetQuoteInputData, GetQuoteProcessData } from '../load-kp/types';
 import helper from './lib/helper';
-import initializeApollo from '@/apollo/client';
 import defaultValues from '@/config/default-values';
 
 export async function getKPData({
   values,
   quote,
+  ctx: { apolloClient },
 }: GetQuoteInputData): Promise<GetQuoteProcessData> {
   const { recalcWithRevision, lead: leadId, opportunity: opportunityId } = values;
 
-  const apolloClient = initializeApollo();
-
   const { getData } = helper({
     apolloClient,
   });

apps/web/process/gibdd/reactions.ts

@@ -9,7 +9,6 @@ import * as CRMTypes from '@/graphql/crm.types';
 import { getCurrentDateString } from '@/utils/date';
 import { normalizeOptions } from '@/utils/entity';
 import { disposableReaction } from '@/utils/mobx';
-import dayjs from 'dayjs';
 import { reaction } from 'mobx';
 
 export function common({ store, apolloClient, queryClient }: ProcessContext) {
@@ -186,18 +185,16 @@ export function common({ store, apolloClient, queryClient }: ProcessContext) {
       const carCategory = getCarCategory(objectTypeTax);
 
       if (OKTMO) {
-        const currentDate = dayjs().utc(false).toDate();
-
         const response = await queryClient.fetchQuery(
-          ['1c', 'trans-tax', carCategory, leaseObjectMotorPower, leaseObjectYear],
+          ['1c', 'trans-tax', carCategory, leaseObjectMotorPower, leaseObjectYear, OKTMO],
           (context) =>
             getTransTax(
               {
+                CalcDate: getCurrentDateString(),
+                CarCategory: carCategory,
                 OKTMO,
-                calcDate: currentDate,
+                Power: leaseObjectMotorPower,
-                carCategory,
+                Year: leaseObjectYear,
-                power: leaseObjectMotorPower,
-                year: leaseObjectYear,
               },
               context
             ),
@@ -206,8 +203,8 @@ export function common({ store, apolloClient, queryClient }: ProcessContext) {
           }
         );
 
-        if (response?.tax) {
+        if (response?.Tax) {
-          $calculation.element('tbxVehicleTaxInYear').setValue(response.tax);
+          $calculation.element('tbxVehicleTaxInYear').setValue(response.Tax);
         } else {
           $calculation.element('tbxVehicleTaxInYear').resetValue();
         }

apps/web/process/hooks/init/get-main-data.js

@@ -36,9 +36,14 @@ function getMainData({ query }, onCompleted, user) {
     query: CRMTypes.GetOpportunitiesDocument,
     variables: { domainname: user.domainName },
   }).then(({ data }) => {
+    const systemuser = data?.systemusers?.[0];
+
+    if (systemuser) {
+      const { opportunities } = systemuser;
       onCompleted({
-      selectOpportunity: data?.opportunities,
+        selectOpportunity: opportunities,
       });
+    }
   });
 
   query({ query: CRMTypes.GetTransactionCurrenciesDocument }).then(({ data }) => {

apps/web/process/insurance/get-kp-data.ts

@@ -11,8 +11,9 @@ import { sum } from 'radash';
 export async function getKPData({
   values,
   quote,
+  ctx,
 }: GetQuoteInputData): Promise<GetQuoteProcessData> {
-  const kpDataFingap = await getKPDataFingap({ quote, values });
+  const kpDataFingap = await getKPDataFingap({ ctx, quote, values });
 
   const risks = kpDataFingap.fingap?.risks;
 

apps/web/process/insurance/reactions.ts

@@ -207,6 +207,7 @@ export function common({ store, apolloClient }: ProcessContext) {
     }
   );
 
+  // объединить со строчкой 308
   debouncedReaction(
     () => $calculation.$values.getValues(['leaseObjectCategory', 'leasingWithoutKasko']),
     async ({ leaseObjectCategory, leasingWithoutKasko }) => {
@@ -303,6 +304,70 @@ export function common({ store, apolloClient }: ProcessContext) {
       }
     }
   );
+
+  // объединить со строчкой 210
+  reaction(
+    () => $calculation.$values.getValues(['leaseObjectType', 'maxSpeed']),
+    async ({ leaseObjectType: leaseObjectTypeId, maxSpeed }) => {
+      if (!leaseObjectTypeId) {
+        $tables.insurance.row('osago').column('insuranceCompany').unblock();
+        $tables.insurance.row('osago').column('insured').unblock();
+        $tables.insurance.row('osago').column('insCost').unblock();
+
+        return;
+      }
+
+      const {
+        data: { evo_leasingobject_type },
+      } = await apolloClient.query({
+        query: CRMTypes.GetLeaseObjectTypeDocument,
+        variables: {
+          leaseObjectTypeId,
+        },
+      });
+
+      const {
+        data: { accounts },
+      } = await apolloClient.query({
+        query: CRMTypes.GetInsuranceCompaniesDocument,
+      });
+
+      if (
+        evo_leasingobject_type?.evo_id &&
+        ['9', '6', '10'].includes(evo_leasingobject_type.evo_id) &&
+        maxSpeed < 20
+      ) {
+        const otherInsuranceCompany = accounts?.find(
+          (x) => x?.evo_type_ins_policy === null && x.label?.includes('ПРОЧИЕ')
+        );
+
+        if (otherInsuranceCompany) {
+          $tables.insurance
+            .row('osago')
+            .column('insuranceCompany')
+            .setOptions(normalizeOptions([otherInsuranceCompany]))
+            .setValue(otherInsuranceCompany.value)
+            .block();
+        }
+
+        $tables.insurance.row('osago').column('insured').setValue(100_000_000).block();
+        $tables.insurance.row('osago').column('insCost').setValue(0).block();
+      } else {
+        const defaultOsagoOptions = accounts?.filter((x) =>
+          x?.evo_type_ins_policy?.includes(100_000_001)
+        );
+
+        $tables.insurance
+          .row('osago')
+          .column('insuranceCompany')
+          .setOptions(normalizeOptions(defaultOsagoOptions))
+          .unblock();
+
+        $tables.insurance.row('osago').column('insured').unblock();
+        $tables.insurance.row('osago').column('insCost').unblock();
+      }
+    }
+  );
 }
 
 export const validation = createValidationReaction(createValidationSchema);

apps/web/process/insurance/validation.ts

@@ -16,6 +16,7 @@ export function createValidationSchema({ apolloClient }: ValidationContext) {
     leaseObjectType: true,
     leasingPeriod: true,
     leasingWithoutKasko: true,
+    maxSpeed: true,
     partialVAT: true,
     plPriceRub: true,
     product: true,
@@ -42,6 +43,7 @@ export function createValidationSchema({ apolloClient }: ValidationContext) {
           leaseObjectType: leaseObjectTypeId,
           firstPaymentPerc,
           plPriceRub,
+          maxSpeed,
         },
         ctx
       ) => {
@@ -251,6 +253,19 @@ export function createValidationSchema({ apolloClient }: ValidationContext) {
             path: ['tbxLeaseObjectPrice'],
           });
         }
+
+        if (
+          evo_leasingobject_type?.evo_id &&
+          ['9', '6', '10'].includes(evo_leasingobject_type?.evo_id) &&
+          maxSpeed < 20 &&
+          insurance.values.osago.insured === 100_000_001
+        ) {
+          ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            message: 'Нельзя включать в график ОСАГО по Спецтехнике, т.к. полис не требуется',
+            path: ['insurance'],
+          });
+        }
       }
     );
 }

apps/web/process/leasing-object/get-kp-data.ts

@@ -1,14 +1,12 @@
 import type { GetQuoteInputData, GetQuoteProcessData } from '../load-kp/types';
 import helper from './lib/helper';
-import initializeApollo from '@/apollo/client';
 import defaultValues from '@/config/default-values';
 
 export async function getKPData({
   values: { recalcWithRevision },
   quote,
+  ctx: { apolloClient },
 }: GetQuoteInputData): Promise<GetQuoteProcessData> {
-  const apolloClient = initializeApollo();
-
   const brand = quote?.evo_brandid ?? defaultValues.brand;
   const model = quote?.evo_modelid ?? defaultValues.model;
   const leaseObjectUsed = quote?.evo_leasingobject_used ?? defaultValues.leaseObjectUsed;

apps/web/process/leasing-object/validation.ts

@@ -17,6 +17,7 @@ export function createValidationSchema({ apolloClient }: ValidationContext) {
     leaseObjectType: true,
     leaseObjectUseFor: true,
     maxMass: true,
+    maxSpeed: true,
     model: true,
   }).superRefine(
     async (
@@ -32,6 +33,7 @@ export function createValidationSchema({ apolloClient }: ValidationContext) {
         model: modelId,
         leaseObjectUseFor,
         configuration,
+        maxSpeed,
       },
       ctx
     ) => {
@@ -134,21 +136,21 @@ export function createValidationSchema({ apolloClient }: ValidationContext) {
           }
         }
 
-        if (evo_leasingobject_type?.evo_id === '1' && countSeats >= 9) {
+        if (evo_leasingobject_type?.evo_id === '1' && (countSeats <= 0 || countSeats > 9)) {
           ctx.addIssue({
             code: z.ZodIssueCode.custom,
-            message: 'Количество мест должно быть меньше 9',
+            message: 'Количество мест должно быть от 0 до 9',
             path: ['tbxCountSeats'],
           });
         }
 
         if (
           (evo_leasingobject_type?.evo_id === '4' || evo_leasingobject_type?.evo_id === '5') &&
-          countSeats <= 8
+          countSeats <= 9
         ) {
           ctx.addIssue({
             code: z.ZodIssueCode.custom,
-            message: 'Количество мест должно быть больше 8',
+            message: 'Количество мест должно быть не меньше 9',
             path: ['tbxCountSeats'],
           });
         }
@@ -174,6 +176,18 @@ export function createValidationSchema({ apolloClient }: ValidationContext) {
             path: ['selectLeaseObjectCategory'],
           });
         }
+
+        if (
+          evo_leasingobject_type?.evo_id &&
+          ['6', '9', '10'].includes(evo_leasingobject_type?.evo_id) &&
+          !maxSpeed
+        ) {
+          ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            message: 'Не заполнено поле',
+            path: ['tbxMaxSpeed'],
+          });
+        }
       }
     }
   );

apps/web/process/load-kp/reactions.ts

@@ -15,7 +15,7 @@ export function common({ store, trpcClient, apolloClient }: ProcessContext) {
 
   reaction(
     () => $calculation.$values.getValue('quote'),
-    async () => {
+    () => {
       const quote = $calculation.element('selectQuote').getOption();
 
       if (!quote || $process.has('LoadKP') || $process.has('Calculate') || $process.has('CreateKP'))
@@ -29,8 +29,6 @@ export function common({ store, trpcClient, apolloClient }: ProcessContext) {
         onClick: () => message.destroy(key),
       });
 
-      const eltInitialValues = await initElt();
-
       trpcClient.getQuote
         .query({
           values: {
@@ -38,7 +36,7 @@ export function common({ store, trpcClient, apolloClient }: ProcessContext) {
             ...$calculation.$values.getValues(['lead', 'opportunity', 'recalcWithRevision']),
           },
         })
-        .then(({ values, payments, insurance, fingap, elt, options }) => {
+        .then(async ({ values, payments, insurance, fingap, elt, options }) => {
           if (options?.selectTarif) {
             $calculation.element('selectTarif').setOptions(normalizeOptions(options.selectTarif));
           } else {
@@ -76,6 +74,7 @@ export function common({ store, trpcClient, apolloClient }: ProcessContext) {
             $tables.fingap.setRisks(fingap.risks);
             $tables.fingap.setSelectedKeys(fingap.keys);
           }
+          const eltInitialValues = await initElt();
 
           if (eltInitialValues) {
             $tables.elt.kasko.setRows(eltInitialValues.kasko);

apps/web/process/recalc/reactions.ts

@@ -1,10 +1,11 @@
 import type { ProcessContext } from '../types';
 import { createValidationSchema } from './validation';
 import type { Elements } from '@/Components/Calculation/config/map/values';
+import * as CRMTypes from '@/graphql/crm.types';
 import { createValidationReaction } from '@/process/tools';
 import { reaction } from 'mobx';
 
-export function common({ store }: ProcessContext) {
+export function common({ store, apolloClient }: ProcessContext) {
   const { $calculation, $tables } = store;
 
   reaction(
@@ -65,6 +66,7 @@ export function common({ store }: ProcessContext) {
       // 'tbxLastPaymentRub',
       'cbxPartialVAT',
     ];
+
     reaction(
       () => $calculation.element('cbxRecalcWithRevision').getValue(),
       (recalcWithRevision) => {
@@ -79,7 +81,53 @@ export function common({ store }: ProcessContext) {
         }
       }
     );
+  }
 
+  {
+    /**
+     * Закрыть на редактирование поля при Пересчете без пересмотра recalcWithRevision = True и если в Предложении selectQuote в поле "КП по итогам КК" = Да
+     * Срок поставки* radioDeliveryTime
+     * Цель использования*  selectLeaseObjectUseFor
+     * Тип двигателя selectEngineType
+     * Децентрализованное страхование cbxInsDecentral
+     */
+    const elements: Elements[] = [
+      'radioDeliveryTime',
+      'selectLeaseObjectUseFor',
+      'selectEngineType',
+      'cbxInsDecentral',
+    ];
+
+    reaction(
+      () => $calculation.$values.getValues(['recalcWithRevision', 'quote']),
+      async ({ recalcWithRevision, quote: quoteId }) => {
+        if (!recalcWithRevision || !quoteId) {
+          elements.forEach((elementName) => $calculation.$status.clearOverridedStatus(elementName));
+
+          return;
+        }
+
+        const {
+          data: { quote },
+        } = await apolloClient.query({
+          query: CRMTypes.GetQuoteDocument,
+          variables: {
+            quoteId,
+          },
+        });
+
+        if (quote?.evo_committee_quote === 100_000_000) {
+          elements.forEach((elementName) =>
+            $calculation.$status.overrideStatus(elementName, 'Disabled')
+          );
+        } else {
+          elements.forEach((elementName) => $calculation.$status.clearOverridedStatus(elementName));
+        }
+      }
+    );
+  }
+
+  {
     const agents: Elements[] = [
       'selectCalcBrokerRewardCondition',
       'selectCalcDoubleAgentRewardCondition',

apps/web/process/recalc/validation.ts

@@ -1,6 +1,9 @@
 /* eslint-disable sonarjs/cognitive-complexity */
 /* eslint-disable complexity */
 import type { ValidationContext } from '../types';
+import type { Elements } from '@/Components/Calculation/config/map/values';
+import { FinGAPSchema } from '@/config/schema/fingap';
+import { InsuranceSchema } from '@/config/schema/insurance';
 import ValuesSchema from '@/config/schema/values';
 import { MAX_MASS, VEHICLE_SEATS } from '@/constants/values';
 import * as CRMTypes from '@/graphql/crm.types';
@@ -8,25 +11,36 @@ import { z } from 'zod';
 
 export function createValidationSchema({ apolloClient }: ValidationContext) {
   return ValuesSchema.pick({
+    IRR_Perc: true,
     addEquipmentPrice: true,
     countSeats: true,
     dealerPerson: true,
     discountRub: true,
+    engineVolume: true,
     firstPaymentPerc: true,
     importProgramSum: true,
+    insNSIB: true,
     lastPaymentPerc: true,
     leaseObjectCategory: true,
     leaseObjectCount: true,
+    leaseObjectMotorPower: true,
     leaseObjectPriceWthtVAT: true,
     leaseObjectUsed: true,
     leaseObjectYear: true,
     maxMass: true,
+    objectRegistration: true,
     partialVAT: true,
     plPriceRub: true,
     product: true,
     quote: true,
     recalcWithRevision: true,
-  }).superRefine(
+    technicalCard: true,
+  })
+    .extend({
+      fingap: FinGAPSchema,
+      insurance: InsuranceSchema,
+    })
+    .superRefine(
       async (
         {
           addEquipmentPrice,
@@ -47,6 +61,14 @@ export function createValidationSchema({ apolloClient }: ValidationContext) {
           lastPaymentPerc,
           leaseObjectCategory,
           partialVAT,
+          IRR_Perc,
+          leaseObjectMotorPower,
+          engineVolume,
+          insNSIB,
+          technicalCard,
+          objectRegistration,
+          fingap: fingapRisks,
+          insurance,
         },
         ctx
       ) => {
@@ -64,7 +86,7 @@ export function createValidationSchema({ apolloClient }: ValidationContext) {
 
         if (dealerPersonId && quoteId && productId) {
           const {
-          data: { account: dealerPerson },
+            data: { dealer_person },
           } = await apolloClient.query({
             query: CRMTypes.GetDealerPersonDocument,
             variables: { dealerPersonId },
@@ -79,7 +101,7 @@ export function createValidationSchema({ apolloClient }: ValidationContext) {
 
           const maxCondition1 =
             leaseObjectUsed === false &&
-          dealerPerson?.evo_supplier_type !== 100_000_001 &&
+            dealer_person?.evo_supplier_type !== 100_000_001 &&
             quote?.evo_max_price_change &&
             !partialVAT &&
             plPriceRub - discountRub + addEquipmentPrice - importProgramSum >
@@ -87,14 +109,14 @@ export function createValidationSchema({ apolloClient }: ValidationContext) {
 
           const maxCondition2 =
             leaseObjectUsed === false &&
-          dealerPerson?.evo_supplier_type !== 100_000_001 &&
+            dealer_person?.evo_supplier_type !== 100_000_001 &&
             quote?.evo_max_price_change &&
             partialVAT &&
             leaseObjectPriceWthtVAT >
               quote.evo_max_price_change - (quote.evo_nds_in_price_supplier_currency || 0);
 
           const maxCondition3 =
-          (leaseObjectUsed === true || dealerPerson?.evo_supplier_type === 100_000_001) &&
+            (leaseObjectUsed === true || dealer_person?.evo_supplier_type === 100_000_001) &&
             quote?.evo_supplier_currency_price &&
             plPriceRub - discountRub + addEquipmentPrice - importProgramSum >
               quote.evo_supplier_currency_price -
@@ -222,6 +244,133 @@ export function createValidationSchema({ apolloClient }: ValidationContext) {
               path: ['selectProduct'],
             });
           }
+
+          if (quote?.evo_committee_quote === 100_000_000 && quote.evo_accept_quoteid) {
+            const {
+              data: { quote: accept_quote },
+            } = await apolloClient.query({
+              query: CRMTypes.GetQuoteDocument,
+              variables: { quoteId: quote.evo_accept_quoteid },
+            });
+
+            if (accept_quote?.evo_msfo_irr && IRR_Perc - accept_quote?.evo_msfo_irr > 0.1)
+              ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                message: 'Нельзя увеличивать IRR после рассмотрения предложения на КК',
+                path: ['tbxIRR_Perc'] as Elements[],
+              });
+
+            if (
+              accept_quote?.evo_power &&
+              Math.abs(leaseObjectMotorPower - accept_quote.evo_power) > 10
+            ) {
+              ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                message:
+                  'Нельзя корректировать мощность более чем на 10 л.с. после рассмотрения предложения на КК',
+                path: ['tbxLeaseObjectMotorPower'] as Elements[],
+              });
+            }
+
+            if (
+              accept_quote?.evo_engine_volume &&
+              Math.abs(engineVolume - accept_quote.evo_engine_volume) > 0.1
+            ) {
+              ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                message:
+                  'Нельзя корректировать объем двигателя более чем на 0.1 л после рассмотрения предложения на КК',
+                path: ['tbxEngineVolume'] as Elements[],
+              });
+            }
+
+            if (insNSIB && !accept_quote?.evo_nsib) {
+              ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                message: 'Нельзя включать в график НСИБ после рассмотрения предложения на КК',
+                path: ['selectInsNSIB'] as Elements[],
+              });
+            }
+
+            if (
+              technicalCard &&
+              !accept_quote?.evo_addproduct_types?.some((x) => x?.evo_product_type === 100_000_000)
+            ) {
+              ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                message:
+                  'Нельзя включать в график карту тех.помощи после рассмотрения предложения на КК',
+                path: ['selectTechnicalCard'] as Elements[],
+              });
+            }
+
+            if (
+              objectRegistration &&
+              objectRegistration !== accept_quote?.evo_db_accept_registration
+            ) {
+              ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                message: 'Нельзя менять регистрацию после рассмотрения предложения на КК',
+                path: ['radioObjectRegistration'] as Elements[],
+              });
+            }
+
+            if (
+              insurance.values.fingap.insured === 100_000_001 &&
+              fingapRisks?.length > 0 &&
+              fingapRisks.some(
+                (fingapRisk) =>
+                  !accept_quote?.evo_product_risks?.some(
+                    (evo_product_risk) =>
+                      fingapRisk.riskId === evo_product_risk?.evo_addproduct_typeid
+                  )
+              )
+            ) {
+              ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                message:
+                  'Нельзя включать новые риски Safe Finance после рассмотрения предложения на КК',
+                path: ['fingap'],
+              });
+            }
+
+            if (
+              insurance.values.fingap.insured === 100_000_001 &&
+              accept_quote?.evo_fingap_payer &&
+              insurance.values.fingap.insured !== accept_quote?.evo_fingap_payer
+            ) {
+              ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                message:
+                  'Нельзя включать в график SafeFinance после рассмотрения предложения на КК',
+                path: ['insurance'],
+              });
+            }
+
+            if (
+              insurance.values.osago.insured === 100_000_001 &&
+              accept_quote?.evo_osago_payer &&
+              insurance.values.osago.insured !== accept_quote?.evo_osago_payer
+            ) {
+              ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                message: 'Нельзя включать в график ОСАГО после рассмотрения предложения на КК',
+                path: ['insurance'],
+              });
+            }
+
+            if (
+              insurance.values.kasko.insured === 100_000_001 &&
+              accept_quote?.evo_kasko_payer &&
+              insurance.values.kasko.insured !== accept_quote?.evo_kasko_payer
+            ) {
+              ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                message: 'Нельзя включать в график КАСКО после рассмотрения предложения на КК',
+                path: ['insurance'],
+              });
+            }
+          }
         }
       }
     );

apps/web/process/subsidy/get-kp-data.ts

@@ -1,6 +1,5 @@
 import type { GetQuoteInputData, GetQuoteProcessData } from '../load-kp/types';
 import helper from './lib/helper';
-import initializeApollo from '@/apollo/client';
 import defaultValues from '@/config/default-values';
 import { getKPData as getKPDataPrice } from '@/process/price/get-kp-data';
 import { createCurrencyUtility } from '@/utils/currency';
@@ -8,10 +7,11 @@ import { createCurrencyUtility } from '@/utils/currency';
 export async function getKPData({
   values,
   quote,
+  ctx,
 }: GetQuoteInputData): Promise<GetQuoteProcessData> {
-  const apolloClient = initializeApollo();
+  const { apolloClient } = ctx;
 
-  const kpDataPrice = await getKPDataPrice({ quote, values });
+  const kpDataPrice = await getKPDataPrice({ ctx, quote, values });
   const { RUB } = createCurrencyUtility({ apolloClient });
 
   const supplierCurrency = kpDataPrice.values?.supplierCurrency ?? defaultValues.supplierCurrency;

apps/web/process/supplier-agent/get-kp-data/get-sums.ts

@@ -1,5 +1,5 @@
-import initializeApollo from '@/apollo/client';
 import * as CRMTypes from '@/graphql/crm.types';
+import type { GetQuoteContext } from '@/server/routers/quote/types';
 
 type Quote = NonNullable<CRMTypes.GetQuoteDataQuery['quote']>;
 
@@ -19,7 +19,8 @@ type QuoteTotalFields =
   | 'evo_double_agent_reward_total'
   | 'evo_fin_department_reward_total';
 
-async function getRewardSum(
+function makeGetRewardSum({ apolloClient }: GetQuoteContext) {
+  return async function (
     conditionId: string | null | undefined,
     quote: Quote,
     quoteRewardSummField: keyof Pick<Quote, QuoteSumFields>,
@@ -27,7 +28,6 @@ async function getRewardSum(
   ) {
     if (!conditionId) return 0;
 
-  const apolloClient = initializeApollo();
     const {
       data: { evo_reward_condition },
     } = await apolloClient.query<
@@ -45,13 +45,16 @@ async function getRewardSum(
     }
 
     return quote[quoteRewardTotalField];
+  };
 }
 
-export default async function getSums(quote: Quote | null) {
+export default async function getSums(quote: Quote | null, ctx: GetQuoteContext) {
   if (!quote) {
     return null;
   }
 
+  const getRewardSum = makeGetRewardSum(ctx);
+
   const [
     dealerRewardSumm,
     dealerBrokerRewardSumm,

apps/web/process/supplier-agent/get-kp-data/index.ts

@@ -3,8 +3,8 @@ import type { GetQuoteInputData, GetQuoteProcessData } from '../../load-kp/types
 import getSums from './get-sums';
 import defaultValues from '@/config/default-values';
 
-export async function getKPData({ quote }: GetQuoteInputData): Promise<GetQuoteProcessData> {
+export async function getKPData({ quote, ctx }: GetQuoteInputData): Promise<GetQuoteProcessData> {
-  const sums = await getSums(quote);
+  const sums = await getSums(quote, ctx);
 
   return {
     values: {

apps/web/process/supplier-agent/reactions/supplier.ts

@@ -75,21 +75,21 @@ export function common({ store, apolloClient }: ProcessContext) {
       }
 
       const {
-        data: { dealer },
+        data: { dealer_person },
       } = await apolloClient.query({
-        query: CRMTypes.GetDealerDocument,
+        query: CRMTypes.GetDealerPersonDocument,
         variables: {
-          dealerId: dealerPersonId,
+          dealerPersonId,
         },
       });
 
-      if (dealer?.evo_broker_accountid) {
+      if (dealer_person?.evo_broker_accountid) {
         const {
           data: { agent: dealerBroker },
         } = await apolloClient.query<CRMTypes.GetAgentQuery, CRMTypes.GetAgentQueryVariables>({
           query: CRMTypes.GetAgentDocument,
           variables: {
-            agentid: dealer?.evo_broker_accountid,
+            agentid: dealer_person?.evo_broker_accountid,
           },
         });
 
@@ -167,4 +167,53 @@ export function common({ store, apolloClient }: ProcessContext) {
         .setValue(Boolean(evo_baseproduct?.evo_supplier_financing_accept));
     }
   );
+
+  {
+    // eslint-disable-next-line no-inner-declarations
+    function unblock() {
+      const cbxPartialVAT = $calculation.element('cbxPartialVAT');
+      cbxPartialVAT.unblock();
+      if (cbxPartialVAT.getValue()) $calculation.element('tbxVATInLeaseObjectPrice').unblock();
+
+      $calculation.element('cbxInsDecentral').unblock();
+      $calculation.element('selectDealerPerson').unblock();
+      $calculation.element('selectDealerRewardCondition').unblock();
+      $calculation.element('selectDealerBroker').unblock();
+      $calculation.element('selectDealerBrokerRewardCondition').unblock();
+    }
+
+    /**
+     * @see 'apps/web/process/used-pl/reactions.ts:common (40)'
+     */
+    reaction(
+      () => $calculation.$values.getValues(['dealerPerson', 'partialVAT']),
+      async ({ dealerPerson: dealerPersonId }) => {
+        if (!dealerPersonId) {
+          unblock();
+
+          return;
+        }
+
+        const { data } = await apolloClient.query({
+          query: CRMTypes.GetDealerPersonDocument,
+          variables: {
+            dealerPersonId,
+          },
+        });
+
+        if (data?.dealer_person?.evo_legal_form === 100_000_004) {
+          $calculation.element('cbxPartialVAT').setValue(true).block();
+          $calculation.element('tbxVATInLeaseObjectPrice').resetValue().block();
+          $calculation.element('cbxInsDecentral').setValue(false).block();
+          $calculation.element('selectDealerRewardCondition').block();
+          $calculation.element('tbxDealerRewardSumm').resetValue().block();
+          $calculation.element('selectDealerBroker').resetValue().block();
+          $calculation.element('selectDealerBrokerRewardCondition').resetValue().block();
+          $calculation.element('tbxDealerBrokerRewardSumm').resetValue().block();
+        } else {
+          unblock();
+        }
+      }
+    );
+  }
 }

apps/web/process/supplier-agent/validation.ts

@@ -190,7 +190,7 @@ export function createValidationSchema(context: ValidationContext) {
         dealerBroker,
         dealerBrokerRewardCondition,
         dealerBrokerRewardSumm,
-        dealerPerson,
+        dealerPerson: dealerPersonId,
         dealerRewardCondition,
         dealerRewardSumm,
         finDepartmentRewardCondtion,
@@ -248,12 +248,12 @@ export function createValidationSchema(context: ValidationContext) {
 
       if (
         dealerRewardSumm > 0 &&
-        Boolean(dealerPerson) &&
+        Boolean(dealerPersonId) &&
-        ((dealerPerson === dealerBroker && dealerBrokerRewardSumm > 0) ||
+        ((dealerPersonId === dealerBroker && dealerBrokerRewardSumm > 0) ||
-          (dealerPerson === indAgent && indAgentRewardSumm > 0) ||
+          (dealerPersonId === indAgent && indAgentRewardSumm > 0) ||
-          (dealerPerson === calcDoubleAgent && calcDoubleAgentRewardSumm > 0) ||
+          (dealerPersonId === calcDoubleAgent && calcDoubleAgentRewardSumm > 0) ||
-          (dealerPerson === calcBroker && calcBrokerRewardSum > 0) ||
+          (dealerPersonId === calcBroker && calcBrokerRewardSum > 0) ||
-          (dealerPerson === calcFinDepartment && finDepartmentRewardSumm > 0))
+          (dealerPersonId === calcFinDepartment && finDepartmentRewardSumm > 0))
       ) {
         ctx.addIssue({
           code: z.ZodIssueCode.custom,
@@ -265,7 +265,7 @@ export function createValidationSchema(context: ValidationContext) {
       if (
         dealerBrokerRewardSumm > 0 &&
         Boolean(dealerBroker) &&
-        ((dealerBroker === dealerPerson && dealerRewardSumm > 0) ||
+        ((dealerBroker === dealerPersonId && dealerRewardSumm > 0) ||
           (dealerBroker === indAgent && indAgentRewardSumm > 0) ||
           (dealerBroker === calcDoubleAgent && calcDoubleAgentRewardSumm > 0) ||
           (dealerBroker === calcBroker && calcBrokerRewardSum > 0) ||
@@ -281,7 +281,7 @@ export function createValidationSchema(context: ValidationContext) {
       if (
         indAgentRewardSumm > 0 &&
         Boolean(indAgent) &&
-        ((indAgent === dealerPerson && dealerRewardSumm > 0) ||
+        ((indAgent === dealerPersonId && dealerRewardSumm > 0) ||
           (indAgent === dealerBroker && dealerBrokerRewardSumm > 0) ||
           (indAgent === calcDoubleAgent && calcDoubleAgentRewardSumm > 0) ||
           (indAgent === calcBroker && calcBrokerRewardSum > 0) ||
@@ -297,7 +297,7 @@ export function createValidationSchema(context: ValidationContext) {
       if (
         calcDoubleAgentRewardSumm > 0 &&
         Boolean(calcDoubleAgent) &&
-        ((calcDoubleAgent === dealerPerson && dealerRewardSumm > 0) ||
+        ((calcDoubleAgent === dealerPersonId && dealerRewardSumm > 0) ||
           (calcDoubleAgent === dealerBroker && dealerBrokerRewardSumm > 0) ||
           (calcDoubleAgent === indAgent && indAgentRewardSumm > 0) ||
           (calcDoubleAgent === calcBroker && calcBrokerRewardSum > 0) ||
@@ -313,7 +313,7 @@ export function createValidationSchema(context: ValidationContext) {
       if (
         calcBrokerRewardSum > 0 &&
         Boolean(calcBroker) &&
-        ((calcBroker === dealerPerson && dealerRewardSumm > 0) ||
+        ((calcBroker === dealerPersonId && dealerRewardSumm > 0) ||
           (calcBroker === dealerBroker && dealerBrokerRewardSumm > 0) ||
           (calcBroker === indAgent && indAgentRewardSumm > 0) ||
           (calcBroker === calcDoubleAgent && calcDoubleAgentRewardSumm > 0) ||
@@ -329,7 +329,7 @@ export function createValidationSchema(context: ValidationContext) {
       if (
         finDepartmentRewardSumm > 0 &&
         Boolean(calcFinDepartment) &&
-        ((calcFinDepartment === dealerPerson && dealerRewardSumm > 0) ||
+        ((calcFinDepartment === dealerPersonId && dealerRewardSumm > 0) ||
           (calcFinDepartment === dealerBroker && dealerBrokerRewardSumm > 0) ||
           (calcFinDepartment === indAgent && indAgentRewardSumm > 0) ||
           (calcFinDepartment === calcDoubleAgent && calcDoubleAgentRewardSumm > 0) ||
@@ -360,7 +360,7 @@ export function createValidationSchema(context: ValidationContext) {
           },
         });
 
-        if (!dealerPerson && !dealer?.evo_return_leasing_dealer)
+        if (!dealerPersonId && !dealer?.evo_return_leasing_dealer)
           ctx.addIssue({
             code: z.ZodIssueCode.custom,
             message: 'Не заполнено поле',
@@ -377,14 +377,29 @@ export function createValidationSchema(context: ValidationContext) {
       const { validateRewardSum, validateRewardWithoutOtherAgent } = helper({ ...context, ctx });
 
       await validateRewardSum({
-        agentid: dealerPerson,
+        agentid: dealerPersonId,
         conditionId: dealerRewardCondition,
         sum: dealerRewardSumm,
         sumFieldName: 'tbxDealerRewardSumm',
       });
 
+      let evo_broker_accountid: string | null = null;
+
+      if (dealerPersonId) {
+        const {
+          data: { dealer_person },
+        } = await apolloClient.query({
+          query: CRMTypes.GetDealerPersonDocument,
+          variables: {
+            dealerPersonId,
+          },
+        });
+
+        evo_broker_accountid = dealer_person?.evo_broker_accountid || null;
+      }
+
       await validateRewardSum({
-        agentid: dealerBroker,
+        agentid: dealerBroker || evo_broker_accountid,
         conditionId: dealerBrokerRewardCondition,
         sum: dealerBrokerRewardSumm,
         sumFieldName: 'tbxDealerBrokerRewardSumm',
@@ -467,6 +482,46 @@ export function createValidationSchema(context: ValidationContext) {
         });
       }
 
+      if (dealerPersonId) {
+        const {
+          data: { dealer_person },
+        } = await apolloClient.query({
+          query: CRMTypes.GetDealerPersonDocument,
+          variables: {
+            dealerPersonId,
+          },
+        });
+
+        // eslint-disable-next-line no-inner-declarations
+        async function isAgentEqualsToDealerPerson(agentid: string | null) {
+          if (!agentid) return false;
+          if (agentid === dealerPersonId) return true;
+
+          const { data } = await apolloClient.query({
+            query: CRMTypes.GetAgentDocument,
+            variables: {
+              agentid,
+            },
+          });
+
+          return data?.agent?.evo_inn === dealer_person?.evo_inn;
+        }
+
+        if (
+          dealer_person?.evo_legal_form === 100_000_004 &&
+          ((await isAgentEqualsToDealerPerson(indAgent)) ||
+            (await isAgentEqualsToDealerPerson(calcDoubleAgent)) ||
+            (await isAgentEqualsToDealerPerson(calcBroker)) ||
+            (await isAgentEqualsToDealerPerson(calcFinDepartment)))
+        ) {
+          ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            message: 'Нельзя закладывать АВ поставщику-ФЛ',
+            path: ['selectDealerPerson'],
+          });
+        }
+      }
+
       if (brandId) {
         const {
           data: { evo_brand },

apps/web/process/used-pl/reactions.ts

@@ -90,13 +90,13 @@ export function common({ store, apolloClient }: ProcessContext) {
         $calculation.element('selectImportProgram').resetValue();
       }
 
-      if (
+      // if (
-        productId &&
+      //   productId &&
-        partialVAT &&
+      //   partialVAT &&
-        $calculation.element('cbxRecalcWithRevision').getValue() === false
+      //   $calculation.element('cbxRecalcWithRevision').getValue() === false
-      ) {
+      // ) {
-        $calculation.element('cbxLeaseObjectUsed').setValue(true);
+      //   $calculation.element('cbxLeaseObjectUsed').setValue(true);
-      }
+      // }
     }
   );