merge branch 'release/dyn-4885'

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

@@ -618,7 +618,7 @@ export async function makeEltKaskoRequest(
       }
     }
 
-  let classification = '11635';
+  let classification = '11606';
 
   switch (evo_leasingobject_type?.evo_id) {
     case '7': {
@@ -634,7 +634,7 @@ export async function makeEltKaskoRequest(
       break;
     }
     default: {
-      classification = '11635';
+      classification = '11606';
       break;
     }
   }

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/supplier-agent/reactions/supplier.ts

@@ -171,8 +171,10 @@ export function common({ store, apolloClient }: ProcessContext) {
   {
     // eslint-disable-next-line no-inner-declarations
     function unblock() {
-      $calculation.element('cbxPartialVAT').unblock();
+      const cbxPartialVAT = $calculation.element('cbxPartialVAT');
-      $calculation.element('tbxVATInLeaseObjectPrice').unblock();
+      cbxPartialVAT.unblock();
+      if (cbxPartialVAT.getValue()) $calculation.element('tbxVATInLeaseObjectPrice').unblock();
+
       $calculation.element('cbxInsDecentral').unblock();
       $calculation.element('selectDealerPerson').unblock();
       $calculation.element('selectDealerRewardCondition').unblock();
@@ -180,9 +182,12 @@ export function common({ store, apolloClient }: ProcessContext) {
       $calculation.element('selectDealerBrokerRewardCondition').unblock();
     }
 
+    /**
+     * @see 'apps/web/process/used-pl/reactions.ts:common (40)'
+     */
     reaction(
-      () => $calculation.element('selectDealerPerson').getValue(),
+      () => $calculation.$values.getValues(['dealerPerson', 'partialVAT']),
-      async (dealerPersonId) => {
+      async ({ dealerPerson: dealerPersonId }) => {
         if (!dealerPersonId) {
           unblock();
 

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

@@ -508,11 +508,11 @@ export function createValidationSchema(context: ValidationContext) {
         }
 
         if (
-          (dealer_person?.evo_legal_form === 100_000_004 &&
+          dealer_person?.evo_legal_form === 100_000_004 &&
-            ((await isAgentEqualsToDealerPerson(indAgent)) ||
+          ((await isAgentEqualsToDealerPerson(indAgent)) ||
-              (await isAgentEqualsToDealerPerson(calcDoubleAgent)))) ||
+            (await isAgentEqualsToDealerPerson(calcDoubleAgent)) ||
-          (await isAgentEqualsToDealerPerson(calcBroker)) ||
+            (await isAgentEqualsToDealerPerson(calcBroker)) ||
-          (await isAgentEqualsToDealerPerson(calcFinDepartment))
+            (await isAgentEqualsToDealerPerson(calcFinDepartment)))
         ) {
           ctx.addIssue({
             code: z.ZodIssueCode.custom,