@redneckz/wildless-cms-uni-blocks 0.14.952 → 0.14.953

package/mobile/src/components/CreditCardForm/creditCardFormStepsData.tsx

@@ -56,6 +56,7 @@ const EMPLOYMENT_CONTENT: CreditCardSectionsProps[] = [
         label:
           'Клиент на момент оформления заявки на кредит должен быть: официально трудоустроен более 6 месяцев, ' +
           'если Клиент получает з/п на счет РСХБ, то трудоустроен более 3 месяцев, не должен находиться в декретном отпуске',
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
       },
     ],
   },
@@ -65,40 +66,94 @@ const EMPLOYMENT_CONTENT: CreditCardSectionsProps[] = [
   {
     columns: 2,
     inputs: [
-      { name: 'organizationName', required: true, dadata: true, filledByEsia: true },
-      { name: 'inn', required: true, dadata: true, filledByEsia: true },
+      {
+        name: 'organizationName',
+        required: true,
+        dadata: true,
+        filledByEsia: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
+      {
+        name: 'inn',
+        required: true,
+        dadata: true,
+        filledByEsia: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
     ],
   },
   {
-    inputs: [{ name: 'amountWorkers', required: true }],
+    inputs: [
+      {
+        name: 'amountWorkers',
+        required: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
+    ],
   },
   {
     columns: 2,
     inputs: [
-      { name: 'employerActivities', required: true },
+      {
+        name: 'employerActivities',
+        required: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
       {
         name: 'organizationPhone',
         label: 'Телефон работодателя',
         required: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
       },
     ],
   },
   {
     columns: 2,
     inputs: [
-      { name: 'generalSeniority', required: true, filledByEsia: true },
-      { name: 'lastJobExperience', required: true, filledByEsia: true },
-      { name: 'experience5Years', required: true, filledByEsia: true },
-      { name: 'jobsNumber', required: true, filledByEsia: true },
+      {
+        name: 'generalSeniority',
+        required: true,
+        filledByEsia: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
+      {
+        name: 'lastJobExperience',
+        required: true,
+        filledByEsia: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
+      {
+        name: 'experience5Years',
+        required: true,
+        filledByEsia: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
+      {
+        name: 'jobsNumber',
+        required: true,
+        filledByEsia: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
     ],
   },
   {
-    inputs: [{ name: 'beginDate', required: true, filledByEsia: true }],
+    inputs: [
+      {
+        name: 'beginDate',
+        required: true,
+        filledByEsia: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
+    ],
   },
   {
     columns: 2,
     inputs: [
-      { name: 'positionOrganization', required: true },
+      {
+        name: 'positionOrganization',
+        required: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
       {
         name: 'partInBusiness',
         required: true,
@@ -109,9 +164,17 @@ const EMPLOYMENT_CONTENT: CreditCardSectionsProps[] = [
   {
     title: 'Адрес работодателя',
     inputs: [],
+    condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
   },
   {
-    inputs: [{ name: 'organizationAddress', required: true, dadata: true }],
+    inputs: [
+      {
+        name: 'organizationAddress',
+        required: true,
+        dadata: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
+    ],
   },
 ];
 const FAMILY_STATUS_AND_INCOME_CONTENT: CreditCardSectionsProps[] = [
@@ -148,12 +211,20 @@ const FAMILY_STATUS_AND_INCOME_CONTENT: CreditCardSectionsProps[] = [
       {
         name: 'infoCard',
         label: 'Сумма основного и дополнительных доходов после вычета налога',
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
       },
     ],
   },
   {
     columns: 1,
-    inputs: [{ name: 'wages', required: true, filledByEsia: true }],
+    inputs: [
+      {
+        name: 'wages',
+        required: true,
+        filledByEsia: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
+    ],
   },
   {
     columns: 1,
@@ -161,7 +232,7 @@ const FAMILY_STATUS_AND_INCOME_CONTENT: CreditCardSectionsProps[] = [
       {
         name: 'retirementIncome',
         required: true,
-        condition: { name: 'employment', values: ['RETIREE'] },
+        condition: { name: 'employment', values: ['RETIREE', 'WORK_RETIREE'] },
       },
     ],
   },

package/mobile/src/components/CreditForm/CreditFormStep.tsx

@@ -38,7 +38,6 @@ export const CreditFormStep = JSX<CreditFormStepProps>(
         getRetailFormValidator({
           formState,
           inputs,
-          step,
           productType: PRODUCT_TYPE,
         }),
       [inputs],
@@ -57,7 +56,7 @@ export const CreditFormStep = JSX<CreditFormStepProps>(
 
     return (
       <form onSubmit={handleSubmit} className="space-y-m">
-        {renderStep({ sections, field, step, params: { calcData } })}
+        {renderStep({ sections, field, params: { calcData } })}
         <StepsNavigationButtons step={step} isSending={isSending} onPrevStep={onPrevStep} />
       </form>
     );

package/mobile/src/components/CreditForm/creditFormStepsData.tsx

@@ -40,6 +40,7 @@ const EMPLOYMENT_CONTENT: SectionsRetailProps[] = [
         label:
           'Клиент на момент оформления заявки на кредит должен быть: официально трудоустроен более 6 месяцев, ' +
           'если Клиент получает з/п на счет РСХБ, то трудоустроен более 3 месяцев, не должен находиться в декретном отпуске',
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
       },
     ],
   },
@@ -49,34 +50,69 @@ const EMPLOYMENT_CONTENT: SectionsRetailProps[] = [
   {
     columns: 2,
     inputs: [
-      { name: 'organizationName', required: true, dadata: true, filledByEsia: true },
-      { name: 'inn', required: true, dadata: true, filledByEsia: true },
+      {
+        name: 'organizationName',
+        required: true,
+        dadata: true,
+        filledByEsia: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
+      {
+        name: 'inn',
+        required: true,
+        dadata: true,
+        filledByEsia: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
     ],
   },
   {
     columns: 2,
     inputs: [
-      { name: 'amountWorkers', required: true },
+      {
+        name: 'amountWorkers',
+        required: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
       {
         name: 'organizationPhone',
         label: 'Телефон работодателя',
         required: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
       },
     ],
   },
   {
     columns: 2,
     inputs: [
-      { name: 'jobsNumber', required: true, filledByEsia: true },
-      { name: 'beginDate', required: true, filledByEsia: true },
+      {
+        name: 'jobsNumber',
+        required: true,
+        filledByEsia: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
+      {
+        name: 'beginDate',
+        required: true,
+        filledByEsia: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
     ],
   },
   {
     title: 'Адрес работодателя',
     inputs: [],
+    condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
   },
   {
-    inputs: [{ name: 'organizationAddress', required: true, dadata: true }],
+    inputs: [
+      {
+        name: 'organizationAddress',
+        required: true,
+        dadata: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
+    ],
   },
 ];
 const FAMILY_STATUS_AND_INCOME_CONTENT: SectionsRetailProps[] = [
@@ -112,12 +148,20 @@ const FAMILY_STATUS_AND_INCOME_CONTENT: SectionsRetailProps[] = [
       {
         name: 'infoCard',
         label: 'Сумма основного и дополнительных доходов после вычета налога',
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
       },
     ],
   },
   {
     columns: 1,
-    inputs: [{ name: 'wages', required: true, filledByEsia: true }],
+    inputs: [
+      {
+        name: 'wages',
+        required: true,
+        filledByEsia: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
+    ],
   },
   {
     columns: 1,
@@ -125,7 +169,7 @@ const FAMILY_STATUS_AND_INCOME_CONTENT: SectionsRetailProps[] = [
       {
         name: 'retirementIncome',
         required: true,
-        condition: { name: 'employment', values: ['RETIREE'] },
+        condition: { name: 'employment', values: ['RETIREE', 'WORK_RETIREE'] },
       },
     ],
   },

package/mobile/src/components/DebitForm/DebitFormStep.tsx

@@ -32,7 +32,6 @@ export const DebitFormStep = JSX<DebitFormStepProps>(
         getRetailFormValidator({
           formState,
           inputs,
-          step,
           productType: PRODUCT_TYPE,
         }),
       [inputs],
@@ -51,7 +50,7 @@ export const DebitFormStep = JSX<DebitFormStepProps>(
 
     return (
       <form onSubmit={handleSubmit} className="space-y-m">
-        {renderStep({ sections, field, step })}
+        {renderStep({ sections, field })}
         <StepsNavigationButtons step={step} isSending={isSending} onPrevStep={onPrevStep} />
       </form>
     );

package/mobile/src/retail/adaptors/getEmploymentData.tsx

@@ -25,25 +25,29 @@ export const getEmploymentData = (formData: LeadFormState): Partial<Participant>
     partInBusiness,
   } = formData;
 
-  return {
-    employmentContractDate: formatDate(beginDate || '', true),
-    employmentTypeCd: employment,
-    organizationName,
-    organizationInn: inn,
-    organizationActivityTypeCd: employerActivities?.key ? employerActivities : undefined,
-    organizationTypeCd: organization,
-    organizationKindCd: employerOrganization,
-    employeesNumberCd: amountWorkers,
-    opf: legalForm,
-    seniority: generalSeniority,
-    generalSeniority: experience5Years,
-    jobsNumber,
-    lastWorkDuration: lastJobExperience,
-    positionCd: positionOrganization?.key ? positionOrganization : undefined,
-    participantContacts: getParticipantContacts({
-      organizationPhone: organizationPhone && formatPhone(organizationPhone),
-    }),
-    participantAddresses: getParticipantAddresses({ organizationAddress }),
-    ownershipShare: positionOrganization?.key === 'BUSINESS_OWNER' ? partInBusiness : undefined,
-  };
+  return employment?.key === 'RETIREE'
+    ? {
+        employmentTypeCd: employment,
+      }
+    : {
+        employmentContractDate: formatDate(beginDate || '', true),
+        employmentTypeCd: employment,
+        organizationName,
+        organizationInn: inn,
+        organizationActivityTypeCd: employerActivities?.key ? employerActivities : undefined,
+        organizationTypeCd: organization,
+        organizationKindCd: employerOrganization,
+        employeesNumberCd: amountWorkers,
+        opf: legalForm,
+        seniority: generalSeniority,
+        generalSeniority: experience5Years,
+        jobsNumber,
+        lastWorkDuration: lastJobExperience,
+        positionCd: positionOrganization?.key ? positionOrganization : undefined,
+        participantContacts: getParticipantContacts({
+          organizationPhone: organizationPhone && formatPhone(organizationPhone),
+        }),
+        participantAddresses: getParticipantAddresses({ organizationAddress }),
+        ownershipShare: positionOrganization?.key === 'BUSINESS_OWNER' ? partInBusiness : undefined,
+      };
 };

package/mobile/src/retail/utils/calculateInputs.ts

@@ -4,14 +4,12 @@ import { type FieldRetailDef } from '../model/RetailFormContent';
 
 export type GetValue = <K extends keyof LeadFormState>(name: K) => LeadFormState[K];
 
-export const calculateInputs = (getValue: GetValue) => (inputs: FieldRetailDef[], step: number) =>
+export const calculateInputs = (getValue: GetValue) => (inputs: FieldRetailDef[]) =>
   inputs
     .filter((_) => _)
     .map((_) => {
       if (
         [
-          checkIsRetiree(step, getValue),
-          checkIsUnemployedRetiree(_, getValue),
           checkBusinessOwner(_, getValue),
           checkConsentPfrFlg(_, getValue),
           checkAddressFillFromESIA(_, getValue),
@@ -25,12 +23,6 @@ export const calculateInputs = (getValue: GetValue) => (inputs: FieldRetailDef[]
       return _;
     });
 
-const checkIsRetiree = (step: number, getValue: GetValue) =>
-  step === 2 && getValue('employment')?.key === 'RETIREE';
-
-const checkIsUnemployedRetiree = ({ name }: FieldRetailDef, getValue: GetValue) =>
-  name === 'wages' && getValue('employment')?.key === 'RETIREE' && !getValue('inn');
-
 const checkBusinessOwner = ({ name }: FieldRetailDef, getValue: GetValue) =>
   name === 'partInBusiness' && getValue('positionOrganization')?.key !== 'BUSINESS_OWNER';
 
@@ -42,7 +34,7 @@ const checkAddressFact = ({ name }: FieldRetailDef, getValue: GetValue) =>
 
 export const checkCondition = ({ condition }: FieldRetailDef, getValue: GetValue) =>
   condition?.name &&
-  condition?.values?.some((_) => {
+  condition?.values?.every((_) => {
     const dataValue = getValue(condition?.name);
 
     return _ !== ((dataValue as Option)?.key ?? dataValue);

package/mobile/src/retail/utils/renderStep.tsx

@@ -10,18 +10,16 @@ import { renderInputs } from './renderInputs';
 export interface StepProps<SectionsProps extends SectionsRetailProps> {
   sections?: SectionsProps[];
   field: FormFieldRegisterer<LeadFormState>;
-  step: number;
   params?: Record<string, any>;
 }
 
 export const renderStep = <SectionsProps extends SectionsRetailProps>({
   sections,
   field,
-  step,
   params,
 }: StepProps<SectionsProps>) =>
   sections?.map(({ inputs: origInputs = [], columns, title, condition }, i) => {
-    const inputs = calculateInputs(getValue(field))(origInputs, step);
+    const inputs = calculateInputs(getValue(field))(origInputs);
     const cleanElements = [
       !checkCondition({ condition }, getValue(field)) ? renderTitle(title) : null,
       ...renderInputs({ field, inputs, params }),

package/mobile/src/retail/validator/getRetailFormValidator.ts

@@ -17,17 +17,15 @@ import {
 type getRetailFormValidatorProps = {
   formState: LeadFormState;
   inputs: FieldRetailDef[];
-  step: number;
   productType: ProductType;
 };
 
 export const getRetailFormValidator = ({
   formState,
   inputs,
-  step,
   productType,
 }: getRetailFormValidatorProps) =>
-  getFormValidator(calculateInputs((_) => formState[_])(inputs, step), {
+  getFormValidator(calculateInputs((_) => formState[_])(inputs), {
     ...validatorObj,
     limitedBirthday: getLimitedBirthdayValidation(productType),
     dulIssueDate: passportValidator(formState.limitedBirthday as Date),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.952",
+  "version": "0.14.953",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/components/CreditCardForm/CreditCardFormStep.tsx

@@ -32,7 +32,6 @@ export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
         getRetailFormValidator({
           formState,
           inputs,
-          step,
           productType: PRODUCT_TYPE,
         }),
       [inputs],
@@ -51,7 +50,7 @@ export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
 
     return (
       <form onSubmit={handleSubmit} className="space-y-m">
-        {renderStep({ sections, field, step })}
+        {renderStep({ sections, field })}
         <StepsNavigationButtons isSending={isSending} step={step} onPrevStep={onPrevStep} />
       </form>
     );

package/src/components/CreditCardForm/creditCardFormStepsData.tsx

@@ -56,6 +56,7 @@ const EMPLOYMENT_CONTENT: CreditCardSectionsProps[] = [
         label:
           'Клиент на момент оформления заявки на кредит должен быть: официально трудоустроен более 6 месяцев, ' +
           'если Клиент получает з/п на счет РСХБ, то трудоустроен более 3 месяцев, не должен находиться в декретном отпуске',
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
       },
     ],
   },
@@ -65,40 +66,94 @@ const EMPLOYMENT_CONTENT: CreditCardSectionsProps[] = [
   {
     columns: 2,
     inputs: [
-      { name: 'organizationName', required: true, dadata: true, filledByEsia: true },
-      { name: 'inn', required: true, dadata: true, filledByEsia: true },
+      {
+        name: 'organizationName',
+        required: true,
+        dadata: true,
+        filledByEsia: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
+      {
+        name: 'inn',
+        required: true,
+        dadata: true,
+        filledByEsia: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
     ],
   },
   {
-    inputs: [{ name: 'amountWorkers', required: true }],
+    inputs: [
+      {
+        name: 'amountWorkers',
+        required: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
+    ],
   },
   {
     columns: 2,
     inputs: [
-      { name: 'employerActivities', required: true },
+      {
+        name: 'employerActivities',
+        required: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
       {
         name: 'organizationPhone',
         label: 'Телефон работодателя',
         required: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
       },
     ],
   },
   {
     columns: 2,
     inputs: [
-      { name: 'generalSeniority', required: true, filledByEsia: true },
-      { name: 'lastJobExperience', required: true, filledByEsia: true },
-      { name: 'experience5Years', required: true, filledByEsia: true },
-      { name: 'jobsNumber', required: true, filledByEsia: true },
+      {
+        name: 'generalSeniority',
+        required: true,
+        filledByEsia: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
+      {
+        name: 'lastJobExperience',
+        required: true,
+        filledByEsia: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
+      {
+        name: 'experience5Years',
+        required: true,
+        filledByEsia: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
+      {
+        name: 'jobsNumber',
+        required: true,
+        filledByEsia: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
     ],
   },
   {
-    inputs: [{ name: 'beginDate', required: true, filledByEsia: true }],
+    inputs: [
+      {
+        name: 'beginDate',
+        required: true,
+        filledByEsia: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
+    ],
   },
   {
     columns: 2,
     inputs: [
-      { name: 'positionOrganization', required: true },
+      {
+        name: 'positionOrganization',
+        required: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
       {
         name: 'partInBusiness',
         required: true,
@@ -109,9 +164,17 @@ const EMPLOYMENT_CONTENT: CreditCardSectionsProps[] = [
   {
     title: 'Адрес работодателя',
     inputs: [],
+    condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
   },
   {
-    inputs: [{ name: 'organizationAddress', required: true, dadata: true }],
+    inputs: [
+      {
+        name: 'organizationAddress',
+        required: true,
+        dadata: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
+    ],
   },
 ];
 const FAMILY_STATUS_AND_INCOME_CONTENT: CreditCardSectionsProps[] = [
@@ -148,12 +211,20 @@ const FAMILY_STATUS_AND_INCOME_CONTENT: CreditCardSectionsProps[] = [
       {
         name: 'infoCard',
         label: 'Сумма основного и дополнительных доходов после вычета налога',
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
       },
     ],
   },
   {
     columns: 1,
-    inputs: [{ name: 'wages', required: true, filledByEsia: true }],
+    inputs: [
+      {
+        name: 'wages',
+        required: true,
+        filledByEsia: true,
+        condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
+      },
+    ],
   },
   {
     columns: 1,
@@ -161,7 +232,7 @@ const FAMILY_STATUS_AND_INCOME_CONTENT: CreditCardSectionsProps[] = [
       {
         name: 'retirementIncome',
         required: true,
-        condition: { name: 'employment', values: ['RETIREE'] },
+        condition: { name: 'employment', values: ['RETIREE', 'WORK_RETIREE'] },
       },
     ],
   },

package/src/components/CreditForm/CreditFormStep.tsx

@@ -38,7 +38,6 @@ export const CreditFormStep = JSX<CreditFormStepProps>(
         getRetailFormValidator({
           formState,
           inputs,
-          step,
           productType: PRODUCT_TYPE,
         }),
       [inputs],
@@ -57,7 +56,7 @@ export const CreditFormStep = JSX<CreditFormStepProps>(
 
     return (
       <form onSubmit={handleSubmit} className="space-y-m">
-        {renderStep({ sections, field, step, params: { calcData } })}
+        {renderStep({ sections, field, params: { calcData } })}
         <StepsNavigationButtons step={step} isSending={isSending} onPrevStep={onPrevStep} />
       </form>
     );