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

package/mobile/bundle/bundle.umd.js

@@ -8978,12 +8978,10 @@
         return statusesMap[status] || jsx(ReworkStatusContent$1, {});
     };
 
-    const calculateInputs = (getValue) => (inputs, step) => inputs
+    const calculateInputs = (getValue) => (inputs) => inputs
         .filter((_) => _)
         .map((_) => {
         if ([
-            checkIsRetiree(step, getValue),
-            checkIsUnemployedRetiree(_, getValue),
             checkBusinessOwner(_, getValue),
             checkConsentPfrFlg(_, getValue),
             checkAddressFillFromESIA(_, getValue),
@@ -8994,13 +8992,11 @@
         }
         return _;
     });
-    const checkIsRetiree = (step, getValue) => step === 2 && getValue('employment')?.key === 'RETIREE';
-    const checkIsUnemployedRetiree = ({ name }, getValue) => name === 'wages' && getValue('employment')?.key === 'RETIREE' && !getValue('inn');
     const checkBusinessOwner = ({ name }, getValue) => name === 'partInBusiness' && getValue('positionOrganization')?.key !== 'BUSINESS_OWNER';
     const checkAddressFillFromESIA = ({ name, filledByEsia }, getValue) => name?.startsWith('address') && getValue('esiaAccountTypeCd')?.key && filledByEsia;
     const checkAddressFact = ({ name }, getValue) => name === 'addressFact' && getValue('addressMatch');
     const checkCondition = ({ condition }, getValue) => condition?.name &&
-        condition?.values?.some((_) => {
+        condition?.values?.every((_) => {
             const dataValue = getValue(condition?.name);
             return _ !== (dataValue?.key ?? dataValue);
         });
@@ -9010,8 +9006,8 @@
     const InputsMap = { ...InputsRetailMap, ...InputRetailCardMap };
     const renderInputs = ({ field, inputs, params }) => inputs.map(getField(field, params, InputsMap));
 
-    const renderStep = ({ sections, field, step, params, }) => sections?.map(({ inputs: origInputs = [], columns, title, condition }, i) => {
-        const inputs = calculateInputs(getValue(field))(origInputs, step);
+    const renderStep = ({ sections, field, params, }) => sections?.map(({ inputs: origInputs = [], columns, title, condition }, i) => {
+        const inputs = calculateInputs(getValue(field))(origInputs);
         const cleanElements = [
             !checkCondition({ condition }, getValue(field)) ? renderTitle(title) : null,
             ...renderInputs({ field, inputs, params }),
@@ -9022,7 +9018,7 @@
     });
     const getValue = (field) => (name) => field(name)?.value;
 
-    const getRetailFormValidator = ({ formState, inputs, step, productType, }) => getFormValidator(calculateInputs((_) => formState[_])(inputs, step), {
+    const getRetailFormValidator = ({ formState, inputs, productType, }) => getFormValidator(calculateInputs((_) => formState[_])(inputs), {
         ...validatorObj,
         limitedBirthday: getLimitedBirthdayValidation(productType),
         dulIssueDate: passportValidator(formState.limitedBirthday),
@@ -9167,27 +9163,31 @@
 
     const getEmploymentData = (formData) => {
         const { beginDate, employment, organizationName, inn, legalForm, organization, amountWorkers, employerActivities, employerOrganization, generalSeniority, lastJobExperience, experience5Years, jobsNumber, organizationPhone, organizationAddress, positionOrganization, 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$1({
-                organizationPhone: organizationPhone && formatPhone(organizationPhone),
-            }),
-            participantAddresses: getParticipantAddresses$1({ 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$1({
+                    organizationPhone: organizationPhone && formatPhone(organizationPhone),
+                }),
+                participantAddresses: getParticipantAddresses$1({ organizationAddress }),
+                ownershipShare: positionOrganization?.key === 'BUSINESS_OWNER' ? partInBusiness : undefined,
+            };
     };
 
     const getPersonalInfoData = (formData) => {
@@ -9354,7 +9354,6 @@
         const formValidator = useCallback((formState) => getRetailFormValidator({
             formState,
             inputs,
-            step,
             productType: PRODUCT_TYPE$2,
         }), [inputs]);
         const [initialState, onSubmit, isSending] = useCreditCardFormAPI({
@@ -9366,7 +9365,7 @@
             formValidator,
             onSubmit,
         });
-        return (jsxs("form", { onSubmit: handleSubmit, className: "space-y-m", children: [renderStep({ sections, field, step }), jsx(StepsNavigationButtons$2, { isSending: isSending, step: step, onPrevStep: onPrevStep })] }));
+        return (jsxs("form", { onSubmit: handleSubmit, className: "space-y-m", children: [renderStep({ sections, field }), jsx(StepsNavigationButtons$2, { isSending: isSending, step: step, onPrevStep: onPrevStep })] }));
     });
 
     const PERSONAL_DATA = [
@@ -9572,6 +9571,7 @@
                     name: 'infoCard',
                     label: 'Клиент на момент оформления заявки на кредит должен быть: официально трудоустроен более 6 месяцев, ' +
                         'если Клиент получает з/п на счет РСХБ, то трудоустроен более 3 месяцев, не должен находиться в декретном отпуске',
+                    condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
                 },
             ],
         },
@@ -9581,40 +9581,94 @@
         {
             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,
@@ -9625,9 +9679,17 @@
         {
             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$1 = [
@@ -9664,12 +9726,20 @@
                 {
                     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,
@@ -9677,7 +9747,7 @@
                 {
                     name: 'retirementIncome',
                     required: true,
-                    condition: { name: 'employment', values: ['RETIREE'] },
+                    condition: { name: 'employment', values: ['RETIREE', 'WORK_RETIREE'] },
                 },
             ],
         },
@@ -10095,7 +10165,6 @@
         const formValidator = useCallback((formState) => getRetailFormValidator({
             formState,
             inputs,
-            step,
             productType: PRODUCT_TYPE$1,
         }), [inputs]);
         const [initialState, onSubmit, isSending] = useCreditFormAPI({
@@ -10107,7 +10176,7 @@
             formValidator,
             onSubmit,
         });
-        return (jsxs("form", { onSubmit: handleSubmit, className: "space-y-m", children: [renderStep({ sections, field, step, params: { calcData } }), jsx(StepsNavigationButtons$1, { step: step, isSending: isSending, onPrevStep: onPrevStep })] }));
+        return (jsxs("form", { onSubmit: handleSubmit, className: "space-y-m", children: [renderStep({ sections, field, params: { calcData } }), jsx(StepsNavigationButtons$1, { step: step, isSending: isSending, onPrevStep: onPrevStep })] }));
     });
 
     /* eslint-disable max-lines */
@@ -10148,6 +10217,7 @@
                     name: 'infoCard',
                     label: 'Клиент на момент оформления заявки на кредит должен быть: официально трудоустроен более 6 месяцев, ' +
                         'если Клиент получает з/п на счет РСХБ, то трудоустроен более 3 месяцев, не должен находиться в декретном отпуске',
+                    condition: { name: 'employment', values: ['WORK', 'WORK_RETIREE'] },
                 },
             ],
         },
@@ -10157,34 +10227,69 @@
         {
             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 = [
@@ -10220,12 +10325,20 @@
                 {
                     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,
@@ -10233,7 +10346,7 @@
                 {
                     name: 'retirementIncome',
                     required: true,
-                    condition: { name: 'employment', values: ['RETIREE'] },
+                    condition: { name: 'employment', values: ['RETIREE', 'WORK_RETIREE'] },
                 },
             ],
         },
@@ -10598,7 +10711,6 @@
         const formValidator = useCallback((formState) => getRetailFormValidator({
             formState,
             inputs,
-            step,
             productType: PRODUCT_TYPE,
         }), [inputs]);
         const [initialState, onSubmit, isSending] = useDebitFormAPI({
@@ -10610,7 +10722,7 @@
             formValidator,
             onSubmit,
         });
-        return (jsxs("form", { onSubmit: handleSubmit, className: "space-y-m", children: [renderStep({ sections, field, step }), jsx(StepsNavigationButtons, { step: step, isSending: isSending, onPrevStep: onPrevStep })] }));
+        return (jsxs("form", { onSubmit: handleSubmit, className: "space-y-m", children: [renderStep({ sections, field }), jsx(StepsNavigationButtons, { step: step, isSending: isSending, onPrevStep: onPrevStep })] }));
     });
 
     /* eslint-disable max-lines */
@@ -12578,7 +12690,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.951";
+    const packageVersion = "0.14.952";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;