@redneckz/wildless-cms-uni-blocks 0.14.916 → 0.14.918

package/mobile/bundle/bundle.umd.js

@@ -3048,6 +3048,8 @@
         }
         return false;
     });
+    const organizationNameValidator = (isDadataOrganization) => validator((_) => Boolean(_) && Boolean(isDadataOrganization))('Укажите наименование организации');
+    const organizationInnValidator = (isDadataOrganization) => validator((_) => isValidInnLength(_) && Boolean(isDadataOrganization))('Укажите ИНН');
 
     const limitedBirthdayValidationData = {
         credit: {
@@ -4413,19 +4415,28 @@
     });
 
     const AmountWorkersField = JSX(({ field, input }) => {
-        const { data } = useLeadFormData('EMPLOYEES_NUMBER');
         const store = useRetailFormStore();
-        useEffect(() => {
-            if (data) {
-                store.amountWorkers = data;
-            }
-        }, [data]);
         return (jsx(SelectField, { field: field, source: store.amountWorkers ?? [], label: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0440\u0430\u0431\u043E\u0442\u0430\u044E\u0449\u0438\u0445 \u0432 \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0438", fieldName: "amountWorkers", input: input }));
     });
 
     const ArmyIdFlgField = JSX(({ field, input }) => (jsx(CheckboxWithError, { text: "\u041D\u0430\u043B\u0438\u0447\u0438\u0435 \u0432\u043E\u0435\u043D\u043D\u043E\u0433\u043E \u0431\u0438\u043B\u0435\u0442\u0430", ...field(input?.name ?? '') })));
 
-    const BankEmpoleeCodeField = JSX(({ field, input }) => (jsx(DaDataInputControl, { label: "\u041A\u043E\u0434 \u043F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u0438\u0442\u0435\u043B\u044F \u0411\u0430\u043D\u043A\u0430", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043A\u043E\u0434", isInteger: true, ...field(input?.name ?? ''), ...input })));
+    const RadioButtonGroupControl = JSX(({ className, label, error, ...rest }) => (jsxs("div", { className: style('shrink-0 w-full', className), children: [jsx(RadioButtonGroup, { label: getRequiredLabel({ label, errors: rest?.errors }), ...rest }), renderErrorText(error)] })));
+
+    const BUTTON_TYPES = [
+        { id: 'true', text: 'Да' },
+        { id: 'false', text: 'Нет' },
+    ];
+    const BankEmployeeCodeField = JSX(({ field, input }) => {
+        const [bankEmployeeFlg, setBankEmployeeFlg] = useState('');
+        const handleBankEmployeeFlgChange = useCallback((value) => {
+            setBankEmployeeFlg(value);
+            if (value === 'false') {
+                field('bankEmployeeCode')?.onChange?.(null);
+            }
+        }, []);
+        return (jsxs("div", { className: "flex flex-col md:flex-row", children: [jsx(RadioButtonGroupControl, { label: "\u041C\u043D\u0435 \u043F\u043E\u043C\u043E\u0433 \u0441\u043E\u0442\u0440\u0443\u0434\u043D\u0438\u043A \u0411\u0430\u043D\u043A\u0430", orientation: "horizontal", items: BUTTON_TYPES, value: bankEmployeeFlg, onChange: handleBankEmployeeFlgChange }), bankEmployeeFlg === 'true' ? (jsx(DaDataInputControl, { label: "\u041A\u043E\u0434 \u043F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u0438\u0442\u0435\u043B\u044F \u0411\u0430\u043D\u043A\u0430", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043A\u043E\u0434", isInteger: true, maxLength: 8, ...field(input?.name ?? ''), ...input })) : null] }));
+    });
 
     const BankruptcyFlgField = JSX(({ field, input }) => (jsx(CheckboxWithError, { text: "\u0412 \u043E\u0442\u043D\u043E\u0448\u0435\u043D\u0438\u0438 \u043C\u0435\u043D\u044F \u0432\u0435\u0434\u0451\u0442\u0441\u044F \u043F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0441\u0442\u0432\u043E \u043F\u043E \u0434\u0435\u043B\u0443 \u043E \u0431\u0430\u043D\u043A\u0440\u043E\u0442\u0441\u0442\u0432\u0435", ...field(input?.name ?? '') })));
 
@@ -4890,8 +4901,6 @@
         47: 'owner_debit_card_pens_plus',
     };
 
-    const RadioButtonGroupControl = JSX(({ className, label, error, ...rest }) => (jsxs("div", { className: style('shrink-0 w-full', className), children: [jsx(RadioButtonGroup, { label: getRequiredLabel({ label, errors: rest?.errors }), ...rest }), renderErrorText(error)] })));
-
     const RUBLE = [{ id: '810', text: 'Рубли' }];
     const CurrencyField = JSX(({ field, input }) => {
         const { data } = useLeadFormData('CURRENCY');
@@ -4901,6 +4910,15 @@
         return (jsx(RadioButtonGroupControl, { label: "\u0412\u0430\u043B\u044E\u0442\u0430", orientation: "horizontal", items: currencies, ...field(input?.name ?? '') }));
     });
 
+    const getDictionaries = (dictionaries, store) => {
+        Promise.all(Object.entries(dictionaries).map((dictionary) => {
+            const [fieldName, dictionaryName] = dictionary;
+            fetchRetailJSON(`/dictionary?dictionaryType=${encodeURIComponent(dictionaryName)}`, 'POST').then((res) => {
+                store[fieldName] = res;
+            });
+        }));
+    };
+
     const getOrganizationFromInn = async (inn) => {
         const res = await getDaDataHints({
             url: 'suggest/party',
@@ -5008,6 +5026,12 @@
     const getOptionOp = (options) => (key) => options
         .map((_) => ({ key: _.key, text: _.value }))
         .find((_) => _.key === key) ?? null;
+    const organizationDictionaries = {
+        amountWorkers: 'EMPLOYEES_NUMBER',
+        employerOrganization: 'ORGANIZATION_KIND',
+        employerActivities: 'ORGANIZATION_ACTIVITY_TYPE',
+        organization: 'ORGANIZATION_TYPE',
+    };
 
     const updateOrganizationFields = (store, field, item) => {
         const { okved, okopf, inn, organizationName } = getOrganizationRequisites(item);
@@ -5019,6 +5043,8 @@
             organization: getOrganizationType(store?.organization ?? [], okopf, inn),
             employerOrganization: getOrganizationKind(store?.employerOrganization ?? [], okopf),
             organizationName,
+            inn,
+            isDadataOrganization: true,
         };
         for (const fieldName in organizationData) {
             field?.(fieldName)?.onChange?.(organizationData[fieldName]);
@@ -5031,14 +5057,26 @@
         organizationName: item.data?.name?.short_with_opf ?? '',
     });
 
+    const NO_DADATA_ERROR_TEXT$1 = 'Необходимо выбрать ИНН из выпадающего списка';
     const DaDataInnField = JSX(({ field, input }) => {
         const store = useRetailFormStore();
+        const [errorText, setErrorText] = useState('');
         const { employerActivities, employerOrganization, organization, amountWorkers } = store;
         const esiaAccountTypeCd = field?.('esiaAccountTypeCd')?.value;
         const inn = field?.('inn')?.value;
+        const fieldError = field?.('organizationName')?.error;
+        const isDadataOrganization = field('isDadataOrganization')?.value;
+        useEffect(() => {
+            setErrorText(fieldError && !isDadataOrganization ? NO_DADATA_ERROR_TEXT$1 : '');
+        }, [isDadataOrganization, fieldError]);
         const onDaDataChange = useCallback((item) => {
             updateOrganizationFields(store, field, item);
         }, []);
+        useEffect(() => {
+            (async () => {
+                await getDictionaries(organizationDictionaries, store);
+            })();
+        }, []);
         useEffect(() => {
             if (!esiaAccountTypeCd || !inn || !isDictionariesAlreadyLoad(store)) {
                 return;
@@ -5050,16 +5088,15 @@
                 }
             })();
         }, [employerActivities, employerOrganization, organization, amountWorkers]);
-        return (jsx(DaDataInputControl, { label: "\u0418\u041D\u041D", isInteger: true, maxLength: 12, ...input, ...field(input?.name ?? ''), onDaDataChange: onDaDataChange, disabled: isEsiaAuthorize(field, input) }));
+        const onChange = useCallback((value) => {
+            field?.('inn')?.onChange?.(value);
+            field?.('isDadataOrganization')?.onChange?.(false);
+        }, []);
+        return (jsx(DaDataInputControl, { label: "\u0418\u041D\u041D", isInteger: true, maxLength: 12, ...input, ...field(input?.name ?? ''), onDaDataChange: onDaDataChange, disabled: isEsiaAuthorize(field, input), onChange: onChange, error: errorText || field('inn')?.error }));
     });
     const isDictionariesAlreadyLoad = (store) => {
-        const { employerActivities, employerOrganization, organization, amountWorkers, productType } = store;
-        return [
-            employerOrganization,
-            organization,
-            amountWorkers,
-            productType === 'creditCard' ? employerActivities : true,
-        ].every(Boolean);
+        const { employerActivities, employerOrganization, organization, amountWorkers } = store;
+        return [employerOrganization, organization, amountWorkers, employerActivities].every(Boolean);
     };
 
     const DeliveryDateFiels = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0434\u043E\u0441\u0442\u0430\u0432\u043A\u0438", ...field(input?.name ?? ''), minDate: new Date() })));
@@ -5127,24 +5164,12 @@
     });
 
     const EmployerActivitiesField = JSX(({ field, input }) => {
-        const { data } = useLeadFormData('ORGANIZATION_ACTIVITY_TYPE');
         const store = useRetailFormStore();
-        useEffect(() => {
-            if (data) {
-                store.employerActivities = data;
-            }
-        }, [data]);
         return (jsx(SelectField, { field: field, source: store.employerActivities ?? [], label: "\u0412\u0438\u0434 \u0434\u0435\u044F\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u0438 \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0438-\u0440\u0430\u0431\u043E\u0442\u043E\u0434\u0430\u0442\u0435\u043B\u044F", fieldName: "employerActivities", input: input }));
     });
 
     const EmployerOrganizationField = JSX(({ field, input }) => {
-        const { data } = useLeadFormData('ORGANIZATION_KIND');
         const store = useRetailFormStore();
-        useEffect(() => {
-            if (data) {
-                store.employerOrganization = data;
-            }
-        }, [data]);
         return (jsx(SelectField, { field: field, source: store.employerOrganization ?? [], label: "\u0412\u0438\u0434 \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0438 \u0440\u0430\u0431\u043E\u0442\u043E\u0434\u0430\u0442\u0435\u043B\u044F", fieldName: "employerOrganization", input: input }));
     });
 
@@ -5348,23 +5373,27 @@
     });
 
     const OrganizationField = JSX(({ field, input }) => {
-        const { data } = useLeadFormData('ORGANIZATION_TYPE');
         const store = useRetailFormStore();
-        useEffect(() => {
-            if (data) {
-                store.organization = data;
-            }
-        }, [data]);
         return (jsx(SelectField, { field: field, source: store.organization ?? [], label: "\u0422\u0438\u043F \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0438", fieldName: "organization", input: input }));
     });
 
+    const NO_DADATA_ERROR_TEXT = 'Необходимо выбрать организацию из выпадающего списка';
     const OrganizationNameField = JSX(({ field, input }) => {
         const store = useRetailFormStore();
+        const [errorText, setErrorText] = useState('');
+        const fieldError = field?.('organizationName')?.error;
+        const isDadataOrganization = field('isDadataOrganization')?.value;
+        useEffect(() => {
+            setErrorText(fieldError && !isDadataOrganization ? NO_DADATA_ERROR_TEXT : '');
+        }, [isDadataOrganization, fieldError]);
         const onDaDataChange = useCallback((item) => {
-            field?.('inn')?.onChange?.(item.data?.inn);
             updateOrganizationFields(store, field, item);
         }, []);
-        return (jsx(DaDataInputControl, { label: "\u041D\u0430\u0438\u043C\u0435\u043D\u043E\u0432\u0430\u043D\u0438\u0435 \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0438", ...input, ...field(input?.name ?? ''), disabled: isEsiaAuthorize(field, input), onDaDataChange: onDaDataChange }));
+        const onChange = useCallback((value) => {
+            field?.('organizationName')?.onChange?.(value);
+            field?.('isDadataOrganization')?.onChange?.(false);
+        }, []);
+        return (jsx(DaDataInputControl, { label: "\u041D\u0430\u0438\u043C\u0435\u043D\u043E\u0432\u0430\u043D\u0438\u0435 \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0438", ...input, ...field(input?.name ?? ''), disabled: isEsiaAuthorize(field, input), onDaDataChange: onDaDataChange, onChange: onChange, error: errorText || field('organizationName')?.error }));
     });
 
     const OtherIncomeField = JSX(({ field, input }) => (jsx(DaDataInputControl, { label: "\u0418\u043D\u044B\u0435 \u0434\u043E\u0445\u043E\u0434\u044B", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", isInteger: true, ...field(input?.name ?? ''), ...input })));
@@ -5569,7 +5598,7 @@
         shareholderFlg: ShareholderFlgField,
         legalEntityName: LegalEntityNameField,
         creditInRshbCd: CreditInRshbCdField,
-        bankEmployeeCode: BankEmpoleeCodeField,
+        bankEmployeeCode: BankEmployeeCodeField,
         partInBusiness: PartInBusinessField,
         regionRetail: RegionRetailField,
         infoCard: InfoCardField,
@@ -6123,6 +6152,7 @@
             employment: getSelectValue(employment, EMPLOYMENT_TYPE),
             organizationName,
             inn,
+            isDadataOrganization: Boolean(inn),
             employerActivities: getSelectValue(employerActivities),
             organization: getSelectValue(organization),
             employerOrganization: getSelectValue(employerOrganization),
@@ -6336,6 +6366,7 @@
         const [ok, setOK] = useState();
         const saveUserData = useSaveUserData();
         const sessionStore = useSessionStore();
+        const leadFormStore = useLeadFormStore();
         const sendAspects = useSendLeadFormAspects({ data });
         const navigator = locationNavigator();
         const goToNextStep = useCallback(() => {
@@ -6351,7 +6382,7 @@
                 const profileId = await createUserProfile({
                     profile: { phone: formatPhone(transformedFormData.phone) },
                 });
-                const referalData = sessionStore.referalData;
+                const referalData = leadFormStore.referalData;
                 const marketingInfo = sessionStore.marketingInfo;
                 if (!profileId) {
                     throw new Error();
@@ -6548,6 +6579,42 @@
         return res;
     });
 
+    const useReferalProgramm = () => {
+        const leadFormStore = useLeadFormStore();
+        const aspects = useAspects();
+        useEffect(() => {
+            const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
+            const referalCode = params.get('referalCode');
+            const refererCode = params.get('refererCode');
+            const productId = params.get('productId');
+            if (referalCode) {
+                leadFormStore.referalData = {
+                    refererCode,
+                    referalCode,
+                    productId,
+                };
+                const eventJSON = JSON.stringify({
+                    refererCode,
+                    referalCode,
+                    productId,
+                });
+                handleAspects({
+                    aspectsAttributes: [
+                        {
+                            aspectName: 'snowplowEvent',
+                            params: {
+                                eventName: 'ownfin_referal_link_attributes',
+                                eventJSON,
+                            },
+                        },
+                    ],
+                    aspects,
+                    ev: {},
+                });
+            }
+        }, []);
+    };
+
     const initialFormState = {
         surname: '',
         name: '',
@@ -6756,6 +6823,7 @@
         const saveForm = useSetter(leadFormStore, 'leadForm');
         const sessionStore = useSessionStore();
         const queryFromStorage = globalThis.sessionStorage?.getItem(QUERY_STORAGE_KEY);
+        useReferalProgramm();
         const initialFormState = useMemo(() => getInitialFormState$1(inputs, leadFormStore.leadForm, esiaAuthSuccess), [inputs, leadFormStore.leadForm]);
         const requestEsiaProfile = useCallback(async (code, state) => {
             setEsiaStatus(EsiaStatuses.Pending);
@@ -6781,15 +6849,7 @@
         }, []);
         useEffect(() => {
             leadFormStore.productType = productType;
-            const { referalCode, refererCode, productId, marketingInfo } = getLeadQueryParams(queryFromStorage, sessionStore);
-            if (referalCode) {
-                sessionStore.referalData = {
-                    refererCode,
-                    referalCode,
-                    productId,
-                };
-            }
-            sessionStore.marketingInfo = marketingInfo;
+            sessionStore.marketingInfo = getMarketingInfo(queryFromStorage, sessionStore);
         }, [queryFromStorage]);
         useEffect(() => {
             const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
@@ -6805,15 +6865,11 @@
         }, []);
         return initialFormState;
     };
-    const getLeadQueryParams = (queryFromStorage, sessionStore) => {
-        const referalData = sessionStore.referalData;
+    const getMarketingInfo = (queryFromStorage, sessionStore) => {
         const marketingInfoFromStorage = sessionStore.marketingInfo;
         const queryStorage = new URLSearchParams(decodeURIComponent(queryFromStorage || ''));
         const code = queryStorage.get('code');
-        const referalCode = code ? referalData?.referalCode : queryStorage.get('referalCode');
-        const refererCode = code ? referalData?.refererCode : queryStorage.get('refererCode');
-        const productId = code ? referalData?.productId : queryStorage.get('productId');
-        const marketingInfo = code
+        return code
             ? marketingInfoFromStorage
             : {
                 utm_campaign: queryStorage.get('utm_campaign'),
@@ -6824,12 +6880,6 @@
                 bannerId: queryStorage.get('bannerId'),
                 userId: queryStorage.get('userId'),
             };
-        return {
-            referalCode,
-            refererCode,
-            productId,
-            marketingInfo,
-        };
     };
 
     const ApplicationLeadForm = JSX(({ className, title, programId = '', nextStepLink = '/credit-lead', button, productType = 'credit', data, ...rest }) => {
@@ -8450,6 +8500,8 @@
         generalSeniority: generalSeniorityValidator(formState.lastJobExperience),
         beginDate: workBeginDateValidator(formState.limitedBirthday),
         participantDateRegistration: dateRegistrationValidator(formState.limitedBirthday),
+        organizationName: organizationNameValidator(formState.isDadataOrganization),
+        inn: organizationInnValidator(formState.isDadataOrganization),
     })(formState);
 
     const StepsNavigationButtons$2 = JSX(({ step, isSending, onPrevStep }) => {
@@ -8519,6 +8571,7 @@
                 fiasCode: '',
             },
             organizationName: '',
+            isDadataOrganization: false,
             organizationPhone: '',
             partInBusiness: undefined,
             positionOrganization: { key: '', text: '' },
@@ -8535,12 +8588,6 @@
             esiaAccountTypeCd: { key: '', text: '' },
             initiateBankruptcyFlg: isCredit ? false : undefined,
         },
-        {
-            bankruptcyFlg: false,
-            shareholderFlg: false,
-            legalEntityName: '',
-            creditInRshbCd: undefined,
-        },
     ];
 
     const formStateMap$2 = [
@@ -8550,6 +8597,12 @@
             codeWord: '',
         },
         ...getMainFormStateMap(),
+        {
+            bankruptcyFlg: false,
+            shareholderFlg: false,
+            legalEntityName: '',
+            creditInRshbCd: undefined,
+        },
         {
             regionRetail: { key: '', text: '' },
             addressRetail: { key: '', text: '' },
@@ -8609,12 +8662,9 @@
     };
 
     const getPersonalInfoData = (formData) => {
-        const { name, surname, middleName, limitedBirthday = '', phone = '', email, sex, birthPlace, dulIssueDate = '', dulIssuedBy, dulNumber, dulSerie, dulSubdivisionCode, education, participantDateRegistration, housing, addressRegistration, addressFact, addressMatch, } = formData;
+        const { limitedBirthday = '', sex, birthPlace, dulIssueDate = '', dulIssuedBy, dulNumber, dulSerie, dulSubdivisionCode, education, participantDateRegistration, housing, addressRegistration, addressFact, addressMatch, } = formData;
         return {
             birthDate: formatDate(limitedBirthday, true),
-            midname: middleName,
-            name,
-            surname,
             birthPlace,
             dulIssueDate: formatDate(dulIssueDate, true),
             dulIssuedBy,
@@ -8627,10 +8677,6 @@
                 : undefined,
             homeMatchFlg: addressMatch,
             houseTypeCd: housing,
-            participantContacts: getParticipantContacts$1({
-                phone: formatPhone(phone),
-                email,
-            }),
             participantAddresses: getParticipantAddresses$1({
                 addressRegistration,
                 addressFact: addressMatch ? addressRegistration : addressFact,
@@ -8798,21 +8844,14 @@
             title: 'Персональные данные',
             columns: 2,
             inputs: [
-                {
-                    name: 'surname',
-                    required: true,
-                    dadata: true,
-                    filledByEsia: true,
-                },
-                { name: 'name', required: true, dadata: true, filledByEsia: true },
-                { name: 'middleName', dadata: true, filledByEsia: true },
-                { name: 'sex', required: true },
                 { name: 'limitedBirthday', required: true, filledByEsia: true },
                 { name: 'birthPlace', required: true, filledByEsia: true },
-                { name: 'phone', disabled: true, required: true },
-                { name: 'email', required: true, dadata: true },
             ],
         },
+        {
+            columns: 2,
+            inputs: [{ name: 'sex', required: true }],
+        },
         {
             title: 'Паспортные данные',
             columns: 2,
@@ -9007,29 +9046,32 @@
             ],
         },
         {
-            inputs: [
-                { name: 'employment', required: true },
-                { name: 'organizationName', required: true, dadata: true, filledByEsia: true },
-            ],
+            inputs: [{ name: 'employment', required: true }],
         },
         {
             columns: 2,
             inputs: [
+                { name: 'organizationName', required: true, dadata: true, filledByEsia: true },
                 { name: 'inn', required: true, dadata: true, filledByEsia: true },
-                { name: 'legalForm', required: true },
             ],
         },
         {
+            inputs: [{ name: 'amountWorkers', required: true }],
+        },
+        {
+            columns: 2,
             inputs: [
-                { name: 'organization', required: true },
-                { name: 'amountWorkers', required: true },
+                { name: 'employerActivities', required: true },
+                {
+                    name: 'organizationPhone',
+                    label: 'Телефон работодателя',
+                    required: true,
+                },
             ],
         },
         {
             columns: 2,
             inputs: [
-                { name: 'employerActivities', required: true },
-                { name: 'employerOrganization', required: true },
                 { name: 'generalSeniority', required: true, filledByEsia: true },
                 { name: 'lastJobExperience', required: true, filledByEsia: true },
                 { name: 'experience5Years', required: true, filledByEsia: true },
@@ -9037,14 +9079,7 @@
             ],
         },
         {
-            inputs: [
-                {
-                    name: 'organizationPhone',
-                    label: 'Телефон работодателя',
-                    required: true,
-                },
-                { name: 'beginDate', required: true, filledByEsia: true },
-            ],
+            inputs: [{ name: 'beginDate', required: true, filledByEsia: true }],
         },
         {
             columns: 2,
@@ -9178,13 +9213,20 @@
                         values: ['office'],
                     },
                 },
+            ],
+        },
+        {
+            columns: 2,
+            inputs: [
                 {
-                    name: 'bankEmployeeCode',
                     condition: {
                         name: 'methodObtain',
                         values: ['office'],
                     },
                 },
+                {
+                    name: 'bankEmployeeCode',
+                },
             ],
         },
     ];
@@ -9553,38 +9595,30 @@
             ],
         },
         {
-            inputs: [
-                { name: 'employment', required: true },
-                { name: 'organizationName', required: true, dadata: true, filledByEsia: true },
-            ],
+            inputs: [{ name: 'employment', required: true }],
         },
         {
             columns: 2,
             inputs: [
+                { name: 'organizationName', required: true, dadata: true, filledByEsia: true },
                 { name: 'inn', required: true, dadata: true, filledByEsia: true },
-                { name: 'legalForm', required: true },
             ],
         },
         {
+            columns: 2,
             inputs: [
-                { name: 'organization', required: true },
                 { name: 'amountWorkers', required: true },
+                {
+                    name: 'organizationPhone',
+                    label: 'Телефон работодателя',
+                    required: true,
+                },
             ],
         },
         {
             columns: 2,
             inputs: [
-                { name: 'employerOrganization', required: true },
                 { name: 'jobsNumber', required: true, filledByEsia: true },
-            ],
-        },
-        {
-            inputs: [
-                {
-                    name: 'organizationPhone',
-                    label: 'Телефон работодателя',
-                    required: true,
-                },
                 { name: 'beginDate', required: true, filledByEsia: true },
             ],
         },
@@ -9685,7 +9719,12 @@
             ],
         },
         {
-            inputs: [{ name: 'bankEmployeeCode' }],
+            columns: 2,
+            inputs: [
+                {
+                    name: 'bankEmployeeCode',
+                },
+            ],
         },
     ];
     const CALCULATOR_CONTENT = [
@@ -11835,7 +11874,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.915";
+    const packageVersion = "0.14.917";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;