comment:

В таблице ELT добавить фильтр по списку Страховых компаний  в зависимости от Категории ТС leaseObjectCategory:

для КАСКО:
если значение из поля Категория ТС leaseObjectCategory содержится в списке поля "Допустимые категории ТС КАСКО" evo_kasko_category карточки Контрагента,

то выводить данную СК в списке, иначе не выводить

для ОСАГО:
если значение из поля Категория ТС leaseObjectCategory содержится в списке поля "Допустимые категории ТС ОСАГО" evo_osago_category карточки Контрагента,

то выводить данную СК в списке, иначе не выводить

apps/web/Dockerfile

@@ -47,8 +47,6 @@ 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,12 +1,11 @@
 export type RequestTransTax = {
-  CalcDate: string;
-  CarCategory: string;
   OKTMO: string;
-  Power: number;
+  calcDate: Date;
-  Year: number;
+  carCategory: string;
+  power: number;
+  year: number;
 };
 export type ResponseTransTax = {
-  Error: string;
+  error: string;
-  Tax: number;
+  tax: number;
-  TaxRate: number;
 };

apps/web/apollo/link.js

@@ -9,10 +9,6 @@ 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();
 
@@ -48,15 +44,7 @@ export function createLink(headers) {
         }
 
         if (operation.operationName === 'GetInsuranceCompanies') {
-          response.data.accounts = response.data.accounts
+          response.data.accounts = response.data.accounts.map((account) => {
-            .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 {

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,

apps/web/config/default-values.ts

@@ -22,7 +22,7 @@ const defaultValues: CalculationValues = {
   comissionRub: 0,
   configuration: null,
   costIncrease: true,
-  countSeats: 4,
+  countSeats: 0,
   creditRate: RATE,
   dealer: null,
   dealerBroker: null,

apps/web/config/schema/env.js

@@ -2,8 +2,6 @@ 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(),
@@ -13,6 +11,7 @@ const envSchema = z.object({
   URL_CACHE_GET_QUERIES_DIRECT: z.string().default('http://api:3001/proxy/get-queries'),
   URL_CACHE_GET_QUERY_DIRECT: z.string().default('http://api:3001/proxy/get-query'),
   URL_CACHE_RESET_QUERIES_DIRECT: z.string().default('http://api:3001/proxy/reset'),
+  DEV_AUTH_TOKEN: z.string().optional(),
   URL_CORE_CALCULATE_DIRECT: z.string(),
   URL_CORE_FINGAP_DIRECT: z.string(),
   URL_CRM_CREATEKP_DIRECT: z.string(),
@@ -23,7 +22,6 @@ 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

@@ -11,7 +11,6 @@ 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,
@@ -28,7 +27,6 @@ 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/constants/values.js

@@ -12,5 +12,3 @@ 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/graphql/crm.query.graphql

@@ -255,7 +255,7 @@ query GetQuoteData($quoteId: UUID!) {
     evo_graphs {
       createdon
       evo_sumpay_withnds
-      evo_planpayments(orderby: { fieldName: "evo_plandate", sortingType: ASC }) {
+      evo_planpayments {
         evo_payment_ratio
       }
     }
@@ -718,8 +718,6 @@ query GetDealerPerson($dealerPersonId: UUID!) {
     evo_return_leasing_dealer
     evo_broker_accountid
     evo_supplier_financing_accept
-    evo_legal_form
-    evo_inn
   }
 }
 
@@ -727,7 +725,6 @@ query GetAgent($agentid: UUID!) {
   agent(accountid: $agentid) {
     label: name
     value: accountid
-    evo_inn
   }
 }
 

apps/web/mocks/handlers.js

@@ -39,23 +39,20 @@ 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) =>
+  rest.post(URL_ELT_OSAGO, async (req, res, ctx) => res(
-    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(),
@@ -70,8 +67,7 @@ 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

@@ -66,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/pages/api/1c/transtax.ts

@@ -1,38 +0,0 @@
-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/process/bonuses/validation.ts

@@ -10,17 +10,8 @@ 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,5 +1,4 @@
 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';
@@ -32,8 +31,7 @@ export default function reactions({ store, apolloClient }: ProcessContext) {
 
   const { getIrr } = helper({ apolloClient });
 
-  disposableReaction(
+  reaction(
-    () => $process.has('LoadKP'),
     () => $calculation.$values.getValues(['product', 'tarif', 'bonusCoefficient']),
     async (values) => {
       const { min, max } = await getIrr(values);
@@ -42,19 +40,6 @@ 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/elt/lib/helper.ts

@@ -39,10 +39,14 @@ export default function helper({
               x?.evo_type_ins_policy?.includes(100_000_000) &&
               // leaseObjectCategory &&
               // x.evo_kasko_category?.includes(leaseObjectCategory) &&
+              evo_leasingobject_type?.evo_id
+          )
+          .filter(
+            (x) =>
               (evo_leasingobject_type?.evo_id &&
-              ['6', '9', '10'].includes(evo_leasingobject_type.evo_id)
+                ['6', '9', '10'].includes(evo_leasingobject_type.evo_id) &&
-                ? x?.evo_id_elt_smr
+                x?.evo_id_elt_smr) ||
-                : x?.evo_id_elt)
+              x?.evo_id_elt
           )
           .map((x) => ({
             ...defaultRow,

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

@@ -618,26 +618,10 @@ export async function makeEltKaskoRequest(
       }
     }
 
-  let classification = '11606';
+  const classification =
-
+    leaseObjectCategory && [100_000_002, 100_000_003, 100_000_004].includes(leaseObjectCategory)
-  switch (evo_leasingobject_type?.evo_id) {
+      ? '11635'
-    case '7': {
+      : '0';
-      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

@@ -178,7 +178,7 @@ export async function convertEltKaskoResponse(input: ConvertEltKaskoResponseInpu
     skCalcId = defaultRow.skCalcId;
     sum = defaultRow.sum;
     totalFranchise = defaultRow.totalFranchise;
-    error = 'Расчет закрыт';
+    error = 'Расчет возможен только через отдел страхования ЛК';
   }
 
   const cost =

apps/web/process/elt/validation.ts

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

apps/web/process/gibdd/reactions.ts

@@ -9,6 +9,7 @@ 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) {
@@ -185,16 +186,18 @@ 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, OKTMO],
+          ['1c', 'trans-tax', carCategory, leaseObjectMotorPower, leaseObjectYear],
           (context) =>
             getTransTax(
               {
-                CalcDate: getCurrentDateString(),
-                CarCategory: carCategory,
                 OKTMO,
-                Power: leaseObjectMotorPower,
+                calcDate: currentDate,
-                Year: leaseObjectYear,
+                carCategory,
+                power: leaseObjectMotorPower,
+                year: leaseObjectYear,
               },
               context
             ),
@@ -203,8 +206,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/insurance/reactions.ts

@@ -207,7 +207,6 @@ export function common({ store, apolloClient }: ProcessContext) {
     }
   );
 
-  // объединить со строчкой 308
   debouncedReaction(
     () => $calculation.$values.getValues(['leaseObjectCategory', 'leasingWithoutKasko']),
     async ({ leaseObjectCategory, leasingWithoutKasko }) => {
@@ -305,7 +304,6 @@ export function common({ store, apolloClient }: ProcessContext) {
     }
   );
 
-  // объединить со строчкой 210
   reaction(
     () => $calculation.$values.getValues(['leaseObjectType', 'maxSpeed']),
     async ({ leaseObjectType: leaseObjectTypeId, maxSpeed }) => {
@@ -332,11 +330,7 @@ export function common({ store, apolloClient }: ProcessContext) {
         query: CRMTypes.GetInsuranceCompaniesDocument,
       });
 
-      if (
+      if (evo_leasingobject_type?.evo_id === '9' && maxSpeed < 20) {
-        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('ПРОЧИЕ')
         );
@@ -353,16 +347,7 @@ export function common({ store, apolloClient }: ProcessContext) {
         $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) =>
+        $tables.insurance.row('osago').column('insuranceCompany').unblock();
-          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();
       }

apps/web/process/insurance/validation.ts

@@ -256,7 +256,7 @@ export function createValidationSchema({ apolloClient }: ValidationContext) {
 
         if (
           evo_leasingobject_type?.evo_id &&
-          ['9', '6', '10'].includes(evo_leasingobject_type?.evo_id) &&
+          ['9'].includes(evo_leasingobject_type?.evo_id) &&
           maxSpeed < 20 &&
           insurance.values.osago.insured === 100_000_001
         ) {

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

@@ -136,21 +136,21 @@ export function createValidationSchema({ apolloClient }: ValidationContext) {
           }
         }
 
-        if (evo_leasingobject_type?.evo_id === '1' && (countSeats <= 0 || countSeats > 9)) {
+        if (evo_leasingobject_type?.evo_id === '1' && countSeats >= 9) {
           ctx.addIssue({
             code: z.ZodIssueCode.custom,
-            message: 'Количество мест должно быть от 0 до 9',
+            message: 'Количество мест должно быть меньше 9',
             path: ['tbxCountSeats'],
           });
         }
 
         if (
           (evo_leasingobject_type?.evo_id === '4' || evo_leasingobject_type?.evo_id === '5') &&
-          countSeats <= 9
+          countSeats <= 8
         ) {
           ctx.addIssue({
             code: z.ZodIssueCode.custom,
-            message: 'Количество мест должно быть не меньше 9',
+            message: 'Количество мест должно быть больше 8',
             path: ['tbxCountSeats'],
           });
         }

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

@@ -167,53 +167,4 @@ 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: dealerPersonId,
+        dealerPerson,
         dealerRewardCondition,
         dealerRewardSumm,
         finDepartmentRewardCondtion,
@@ -248,12 +248,12 @@ export function createValidationSchema(context: ValidationContext) {
 
       if (
         dealerRewardSumm > 0 &&
-        Boolean(dealerPersonId) &&
+        Boolean(dealerPerson) &&
-        ((dealerPersonId === dealerBroker && dealerBrokerRewardSumm > 0) ||
+        ((dealerPerson === dealerBroker && dealerBrokerRewardSumm > 0) ||
-          (dealerPersonId === indAgent && indAgentRewardSumm > 0) ||
+          (dealerPerson === indAgent && indAgentRewardSumm > 0) ||
-          (dealerPersonId === calcDoubleAgent && calcDoubleAgentRewardSumm > 0) ||
+          (dealerPerson === calcDoubleAgent && calcDoubleAgentRewardSumm > 0) ||
-          (dealerPersonId === calcBroker && calcBrokerRewardSum > 0) ||
+          (dealerPerson === calcBroker && calcBrokerRewardSum > 0) ||
-          (dealerPersonId === calcFinDepartment && finDepartmentRewardSumm > 0))
+          (dealerPerson === calcFinDepartment && finDepartmentRewardSumm > 0))
       ) {
         ctx.addIssue({
           code: z.ZodIssueCode.custom,
@@ -265,7 +265,7 @@ export function createValidationSchema(context: ValidationContext) {
       if (
         dealerBrokerRewardSumm > 0 &&
         Boolean(dealerBroker) &&
-        ((dealerBroker === dealerPersonId && dealerRewardSumm > 0) ||
+        ((dealerBroker === dealerPerson && 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 === dealerPersonId && dealerRewardSumm > 0) ||
+        ((indAgent === dealerPerson && 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 === dealerPersonId && dealerRewardSumm > 0) ||
+        ((calcDoubleAgent === dealerPerson && 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 === dealerPersonId && dealerRewardSumm > 0) ||
+        ((calcBroker === dealerPerson && 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 === dealerPersonId && dealerRewardSumm > 0) ||
+        ((calcFinDepartment === dealerPerson && dealerRewardSumm > 0) ||
           (calcFinDepartment === dealerBroker && dealerBrokerRewardSumm > 0) ||
           (calcFinDepartment === indAgent && indAgentRewardSumm > 0) ||
           (calcFinDepartment === calcDoubleAgent && calcDoubleAgentRewardSumm > 0) ||
@@ -360,7 +360,7 @@ export function createValidationSchema(context: ValidationContext) {
           },
         });
 
-        if (!dealerPersonId && !dealer?.evo_return_leasing_dealer)
+        if (!dealerPerson && !dealer?.evo_return_leasing_dealer)
           ctx.addIssue({
             code: z.ZodIssueCode.custom,
             message: 'Не заполнено поле',
@@ -377,29 +377,14 @@ export function createValidationSchema(context: ValidationContext) {
       const { validateRewardSum, validateRewardWithoutOtherAgent } = helper({ ...context, ctx });
 
       await validateRewardSum({
-        agentid: dealerPersonId,
+        agentid: dealerPerson,
         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 || evo_broker_accountid,
+        agentid: dealerBroker,
         conditionId: dealerBrokerRewardCondition,
         sum: dealerBrokerRewardSumm,
         sumFieldName: 'tbxDealerBrokerRewardSumm',
@@ -482,46 +467,6 @@ 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);
-      // }
+      }
     }
   );
 

apps/web/utils/axios.ts

@@ -4,17 +4,10 @@ import type { AxiosError } from 'axios';
 import { isAxiosError } from 'axios';
 import { pick } from 'radash';
 
-type ResponseError = {
+function getErrorMessage<
-  Error?: string;
+  T extends { error?: string; errors?: string[]; fullMessage?: string; message?: string }
-  error?: string;
+>(error: AxiosError<T>) {
-  errors?: string[];
-  fullMessage?: string;
-  message?: string;
-};
-
-function getErrorMessage<T extends ResponseError>(error: AxiosError<T>) {
   return (
-    error.response?.data?.Error ||
     error.response?.data?.error ||
     error.response?.data?.errors?.[0] ||
     error.response?.data.fullMessage ||

docker-compose.yml

@@ -16,8 +16,6 @@ services:
       - URL_CORE_FINGAP_DIRECT=${URL_CORE_FINGAP_DIRECT}
       - URL_CORE_CALCULATE_DIRECT=${URL_CORE_CALCULATE_DIRECT}
       - URL_1C_TRANSTAX_DIRECT=${URL_1C_TRANSTAX_DIRECT}
-      - USERNAME_1C_TRANSTAX=${USERNAME_1C_TRANSTAX}
-      - PASSWORD_1C_TRANSTAX=${PASSWORD_1C_TRANSTAX}
       - URL_ELT_OSAGO_DIRECT=${URL_ELT_OSAGO_DIRECT}
       - URL_ELT_KASKO_DIRECT=${URL_ELT_KASKO_DIRECT}
     build:
@@ -36,8 +34,6 @@ services:
         - URL_CORE_FINGAP_DIRECT=${URL_CORE_FINGAP_DIRECT}
         - URL_CORE_CALCULATE_DIRECT=${URL_CORE_CALCULATE_DIRECT}
         - URL_1C_TRANSTAX_DIRECT=${URL_1C_TRANSTAX_DIRECT}
-        - USERNAME_1C_TRANSTAX=${USERNAME_1C_TRANSTAX}
-        - PASSWORD_1C_TRANSTAX=${PASSWORD_1C_TRANSTAX}
         - URL_ELT_OSAGO_DIRECT=${URL_ELT_OSAGO_DIRECT}
         - URL_ELT_KASKO_DIRECT=${URL_ELT_KASKO_DIRECT}
       context: .