@redneckz/wildless-cms-uni-blocks 0.14.664 → 0.14.666

package/mobile/bundle/bundle.umd.js

@@ -1538,8 +1538,8 @@
         participantDateRegistration: defaultValidator('Укажите дату регистрации'),
         retirementIncome: defaultValidator(),
         otherIncome: defaultValidator(),
-        mandatoryIncome: defaultValidator(),
-        otherPayments: defaultValidator(),
+        wages: defaultValidator(),
+        mandatoryPayments: defaultValidator(),
         disablePeopleFlg: defaultValidator(),
         bankruptcyFlg: defaultValidator(),
         shareholderFlg: defaultValidator(),
@@ -2477,7 +2477,7 @@
         return (jsx(SelectControl, { label: "\u041D\u0430\u0441\u0435\u043B\u0435\u043D\u043D\u044B\u0439 \u043F\u0443\u043D\u043A\u0442", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0433\u043E\u0440\u043E\u0434, \u0433\u0434\u0435 \u0434\u043E\u0441\u0442\u0443\u043F\u0435\u043D \u0441\u0435\u0440\u0432\u0438\u0441", options: localities, ...getValidation(field('localities'), validatorObj.localities, input?.required), isSearch: true }));
     });
 
-    const MandatoryIncomeField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0421\u043E\u0432\u043E\u043A\u0443\u043F\u043D\u044B\u0439 \u0434\u043E\u0445\u043E\u0434 \u0432 \u043C\u0435\u0441\u044F\u0446 \u043F\u043E\u0441\u043B\u0435 \u0432\u044B\u0447\u0435\u0442\u0430 \u043D\u0430\u043B\u043E\u0433\u043E\u0432 (\u0437\u0430\u0440\u043F\u043B\u0430\u0442\u0430, \u043F\u0440\u0435\u043C\u0438\u0438)", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", type: "number", ...getValidation(field('mandatoryIncome'), validatorObj.mandatoryIncome, input?.required), ...input })));
+    const MandatoryPaymentsField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u044B\u0435 \u0432\u044B\u043F\u043B\u0430\u0442\u044B", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", type: "number", ...getValidation(field('mandatoryPayments'), validatorObj.mandatoryPayments, input?.required), ...input })));
 
     const METHODS_OF_OBTAIN = [
         { id: 'office', text: 'В отделении Банка' },
@@ -2509,8 +2509,6 @@
 
     const OtherIncomeField = JSX(({ field, input }) => (jsx(InputControl, { 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", type: "number", ...getValidation(field('otherIncome'), validatorObj.otherIncome, input?.required), ...input })));
 
-    const OtherPaymentsField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u044B\u0435 \u0432\u044B\u043F\u043B\u0430\u0442\u044B", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", type: "number", ...getValidation(field('otherPayments'), validatorObj.otherPayments, input?.required), ...input })));
-
     const ParticipantDateRegistrationField = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u043F\u043E \u043C\u0435\u0441\u0442\u0443 \u0436\u0438\u0442\u0435\u043B\u044C\u0441\u0442\u0432\u0430", ...getValidation(field('participantDateRegistration'), validatorObj.participantDateRegistration, input?.required) })));
 
     const MAX_PART = 100;
@@ -3260,7 +3258,15 @@
         return (jsx(SelectControl, { label: "\u0420\u0435\u0433\u0438\u043E\u043D", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0440\u0435\u0433\u0438\u043E\u043D", isSearch: true, options: useMemo(() => regions?.map(({ region = '' }) => ({ key: region, text: region })), [regions]), ...getValidation(field('regionRetail'), validatorObj.regionRetail, input?.required) }));
     });
 
-    const RetirementIncomeField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041F\u0435\u043D\u0441\u0438\u043E\u043D\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", type: "number", ...getValidation(field('retirementIncome'), validatorObj.retirementIncome, input?.required), ...input })));
+    const RetirementIncomeField = JSX(({ field, input }) => {
+        const currentWages = field('wages')?.value;
+        const onChange = useCallback((_) => {
+            const incomesSum = Number(_) + Number(currentWages || 0);
+            field('retirementIncome')?.onChange?.(_);
+            field('incomeAverage')?.onChange?.(String(incomesSum));
+        }, [currentWages]);
+        return (jsx(InputControl, { label: "\u041F\u0435\u043D\u0441\u0438\u043E\u043D\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", type: "number", ...getValidation(field('retirementIncome'), validatorObj.retirementIncome, input?.required), ...input, onChange: onChange }));
+    });
 
     const SecondaryPhoneField = JSX(({ field }) => {
         const fieldPhone = field('secondaryPhone');
@@ -3325,6 +3331,16 @@
         return (jsx("div", { className: "py-m gap-m grid @xl:flex @xl:items-center", children: jsx(RadioButtonGroup, { className: "whitespace-normal", orientation: "horizontal", items: VED_TYPES, value: value, onChange: (_) => onChange && onChange(_) }) }));
     });
 
+    const WagesField = JSX(({ field, input }) => {
+        const currentRetirementIncome = field('retirementIncome')?.value;
+        const onChange = useCallback((_) => {
+            const incomesSum = Number(_) + Number(currentRetirementIncome || 0);
+            field('wages')?.onChange?.(_);
+            field('incomeAverage')?.onChange?.(String(incomesSum));
+        }, [currentRetirementIncome]);
+        return (jsx(InputControl, { label: "\u0421\u043E\u0432\u043E\u043A\u0443\u043F\u043D\u044B\u0439 \u0434\u043E\u0445\u043E\u0434 \u0432 \u043C\u0435\u0441\u044F\u0446 \u043F\u043E\u0441\u043B\u0435 \u0432\u044B\u0447\u0435\u0442\u0430 \u043D\u0430\u043B\u043E\u0433\u043E\u0432 (\u0437\u0430\u0440\u043F\u043B\u0430\u0442\u0430, \u043F\u0440\u0435\u043C\u0438\u0438)", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", type: "number", ...getValidation(field('wages'), validatorObj.wages, input?.required), ...input, onChange: onChange }));
+    });
+
     function isRenderField({ input, field, }) {
         const { condition } = input;
         const { value } = field(condition?.name || '');
@@ -3412,8 +3428,8 @@
             participantDateRegistration: jsx(ParticipantDateRegistrationField, { field: field, input: input }),
             retirementIncome: jsx(RetirementIncomeField, { field: field, input: input }),
             otherIncome: jsx(OtherIncomeField, { field: field, input: input }),
-            mandatoryIncome: jsx(MandatoryIncomeField, { field: field, input: input }),
-            otherPayments: jsx(OtherPaymentsField, { field: field, input: input }),
+            wages: jsx(WagesField, { field: field, input: input }),
+            mandatoryPayments: jsx(MandatoryPaymentsField, { field: field, input: input }),
             disablePeopleFlg: jsx(DisablePeopleFlgField, { field: field, input: input }),
             bankruptcyFlg: jsx(BankruptcyFlgField, { field: field, input: input }),
             shareholderFlg: jsx(ShareholderFlgField, { field: field, input: input }),
@@ -3855,11 +3871,11 @@
     });
     const getInputStyle = (index, values, hasError = false) => {
         const isInputEmpty = !values[index];
-        return `w-16 h-20 text-3xl text-center p-2 m-2 border ${hasError && isInputEmpty ? 'border-error' : 'border-gray'} rounded-md caret-transparent outline-none`;
+        return `w-20 h-24 text-5xl text-center p-lg m-2 border ${hasError && isInputEmpty ? 'border-error' : 'border-gray'} rounded-md caret-transparent outline-none`;
     };
 
     const SubmitButton = JSX(({ isDisabled, onClick, text }) => {
-        return (jsx(Button, { type: "button", onClick: onClick, disabled: isDisabled, children: jsx(Text, { font: "font-medium", children: text }) }));
+        return (jsx(Button, { type: "button", onClick: onClick, disabled: isDisabled, children: jsx(Text, { font: "font-normal", children: text }) }));
     });
 
     const checkCode = async (body) => doRequest('/sms/checkCode', 'POST', body).then(saveToken);
@@ -3938,10 +3954,10 @@
         useEffect(() => {
             sendCode();
         }, []);
-        return (jsx(Dialog, { className: "my-6xl max-w-3xl w-full min-h-fit mx-auto rounded-lg", children: jsxs("div", { className: "flex flex-col gap-lg items-center rounded-md", children: [jsx(Headline, { className: "w-full", title: title, description: description, headlineVersion: "S", isEmbedded: true }), code ? (jsx(InputCode, { values: values, setValues: setValues, errorText: errorText, hasError: hasError })) : null, renderText$2(timeNextReq, setTimeNextReq, sendCode), jsx(RichText, { itemSize: "list-s", __html: __html }), renderTextButton(textButton, isSubmitButtonDisabled, handleSubmit), isLoading ? jsx(Loader, { blur: false }) : null] }) }));
+        return (jsx(Dialog, { className: "my-6xl max-w-3xl w-full min-h-fit mx-auto rounded-xl px-5xl py-0", children: jsxs("div", { className: "flex flex-col gap-xl items-center rounded-md", children: [jsx(Headline, { className: "w-full", title: title, description: description, headlineVersion: "XS", isEmbedded: true, as: "h6" }), code ? (jsx(InputCode, { values: values, setValues: setValues, errorText: errorText, hasError: hasError })) : null, renderText$2(timeNextReq, setTimeNextReq, sendCode), jsx(RichText, { itemSize: "list-s", __html: __html }), renderTextButton(textButton, isSubmitButtonDisabled, handleSubmit), isLoading ? jsx(Loader, { blur: false }) : null] }) }));
     });
     const renderTextButton = (textButton, isDisabled, handleSubmit) => textButton ? (jsx(SubmitButton, { isDisabled: isDisabled, onClick: handleSubmit, text: textButton })) : null;
-    const renderText$2 = (timeNextReq, setTimeNextReq, sendCode) => timeNextReq ? (jsxs("div", { className: "flex flex-row text-l font-light text-primary-main", children: ["\u041F\u043E\u043B\u0443\u0447\u0438\u0442\u044C \u043D\u043E\u0432\u044B\u0439 \u043A\u043E\u0434 \u043C\u043E\u0436\u043D\u043E \u0447\u0435\u0440\u0435\u0437", jsx(Timer, { className: "text-primary-main ml-1", time: timeNextReq, setTime: setTimeNextReq })] })) : (jsx(LinkButton, { onClick: sendCode, className: "text-primary-main", children: "\u041F\u043E\u043B\u0443\u0447\u0438\u0442\u044C \u043D\u043E\u0432\u044B\u0439 \u043A\u043E\u0434" }));
+    const renderText$2 = (timeNextReq, setTimeNextReq, sendCode) => timeNextReq ? (jsxs("div", { className: "flex flex-row text-l font-light text-base", children: ["\u041F\u043E\u043B\u0443\u0447\u0438\u0442\u044C \u043D\u043E\u0432\u044B\u0439 \u043A\u043E\u0434 \u043C\u043E\u0436\u043D\u043E \u0447\u0435\u0440\u0435\u0437", jsx(Timer, { className: "text-base ml-1", time: timeNextReq, setTime: setTimeNextReq })] })) : (jsx(LinkButton, { onClick: sendCode, className: "text-primary-main", children: "\u041F\u043E\u043B\u0443\u0447\u0438\u0442\u044C \u043D\u043E\u0432\u044B\u0439 \u043A\u043E\u0434" }));
 
     const useVerifyPhoneDialog = () => {
         const { open, close } = useDialogManager();
@@ -4057,8 +4073,14 @@
         organizationAddress: 'WORK',
     };
     const fieldsNamesToIncomeKeysMap = {
-        mandatoryIncome: 'INCOME_AVERAGE',
-        otherPayments: 'MANDATORY_PAYMENTS',
+        incomeAverage: 'INCOME_AVERAGE',
+        mandatoryPayments: 'MANDATORY_PAYMENTS',
+        additionalIncome: 'ADDITIONAL_INCOME',
+        otherIncome: 'OTHER_INCOME',
+        otherPayments: 'OTHER_PAYMENTS',
+        rentalIncome: 'RENTAL_INCOME',
+        wages: 'WAGES',
+        retirementIncome: 'RETIREMENT_INCOME',
     };
     const getParticipantContacts = (fields) => Object.entries(fields).reduce((acc, [key, value]) => {
         if (key in fieldsNamesToContactKeysMap) {
@@ -4099,7 +4121,7 @@
                     incomeTypeCd: {
                         key: fieldsNamesToIncomeKeysMap[key],
                     },
-                    value,
+                    value: Number(value || 0),
                 },
             ];
         }
@@ -5951,6 +5973,40 @@
             }
         }, type: "button", ...(isUnfolded ? getAspectsAttributes(data) : {}), children: [jsx("div", { children: isUnfolded ? 'Скрыть' : 'Подробнее о тарифе' }), jsx(Icon, { className: "text-primary-text", name: isUnfolded ? 'ArrowUpIcon' : 'ArrowDownIcon', width: "16", height: "16" })] }));
 
+    const PORTAL_NATURAL_URL = '/';
+    const UPDATING_INTERVAL = 60000 * 4;
+    const updateRefreshToken = () => {
+        const refreshToken = globalThis.sessionStorage?.getItem('refreshToken');
+        const accessToken = globalThis.sessionStorage?.getItem('accessToken');
+        const taskId = globalThis.localStorage.getItem('taskId');
+        if (!accessToken || !refreshToken || !taskId) {
+            globalThis.location.href = PORTAL_NATURAL_URL;
+            return () => null;
+        }
+        const updateTokenRequest = async () => {
+            const res = await doRequest('/auth/refresh', 'POST', {
+                // eslint-disable-next-line camelcase
+                refresh_token: refreshToken,
+                // eslint-disable-next-line camelcase
+                access_token: accessToken,
+            });
+            if (res instanceof Response) {
+                handleStatus(res.status);
+                return;
+            }
+            globalThis.sessionStorage.setItem('refreshToken', res.refresh_token);
+            globalThis.sessionStorage.setItem('accessToken', res.access_token);
+        };
+        updateTokenRequest();
+        const timer = setInterval(updateTokenRequest, UPDATING_INTERVAL);
+        return () => clearInterval(timer);
+    };
+    const handleStatus = (status) => {
+        if (status == 401) {
+            globalThis.location.href = PORTAL_NATURAL_URL;
+        }
+    };
+
     const ProgressBar = JSX(({ step = 10, description, showPercentage = true }) => (jsxs("div", { children: [jsx("div", { className: "h-4 w-full bg-gray relative", children: jsx("div", { className: "h-4 bg-green", style: { width: `${step}%` } }) }), jsxs("div", { className: "relative", children: [showPercentage ? jsxs("div", { className: "absolute left-2/4 text-green", children: [step, "%"] }) : null, description ? jsx("div", { className: "text-right mr-4 text-gray", children: description }) : null] })] })));
 
     const CreditCardFormProgress = JSX(({ step = 1, totalSteps = 6, stepsTitles = [] }) => {
@@ -6153,8 +6209,8 @@
             dependents: undefined,
             familyMembers: undefined,
             confirmationIncome: { key: '', text: '' },
-            mandatoryIncome: undefined,
-            otherPayments: undefined,
+            wages: undefined,
+            mandatoryPayments: undefined,
             snils: '',
             armyIdFlg: false,
         },
@@ -6270,14 +6326,20 @@
     };
 
     const getFourthStepData$1 = (formData) => {
-        const { familyStatus, dependents, familyMembers, mandatoryIncome, otherPayments, snils, armyIdFlg, } = formData;
+        const { familyStatus, dependents, familyMembers, wages, mandatoryPayments, incomeAverage, additionalIncome, otherIncome, otherPayments, rentalIncome, retirementIncome, snils, armyIdFlg, } = formData;
         return {
             maritalStatusCd: familyStatus,
             totalDependents: familyMembers,
             otherDependents: dependents,
             participantIncomes: getParticipantIncomes({
-                mandatoryIncome,
+                wages,
+                mandatoryPayments,
+                incomeAverage,
+                additionalIncome,
+                otherIncome,
                 otherPayments,
+                rentalIncome,
+                retirementIncome,
             }),
             snils: snils?.replaceAll(' ', ''),
             armyIdFlg,
@@ -6668,11 +6730,11 @@
             },
             {
                 columns: 1,
-                inputs: [{ fieldType: 'common', name: 'mandatoryIncome', required: true }],
+                inputs: [{ fieldType: 'common', name: 'wages', required: true }],
             },
             {
                 columns: 1,
-                inputs: [{ fieldType: 'common', name: 'otherPayments', required: true }],
+                inputs: [{ fieldType: 'common', name: 'mandatoryPayments', required: true }],
             },
             {
                 columns: 1,
@@ -6810,6 +6872,7 @@
     ];
     const CreditCardForm = JSX(({ className, ...rest }) => {
         const [step, setStep] = useState(0);
+        useEffect(updateRefreshToken, []);
         const handleNextStep = useCallback(() => {
             setStep((_) => Math.min(_ + 1, WIZARD_STEPS$1));
         }, []);
@@ -6822,40 +6885,6 @@
         return (jsx(BlockWrapper, { className: style('bg-transparent', className), defaultPadding: "p-0", ...rest, children: jsxs("div", { className: "container grid grid-cols-12", children: [isFormFinished ? null : (jsx(CreditCardFormProgress, { stepsTitles: WIZARD_TITLES$1, step: step, totalSteps: WIZARD_STEPS$1 })), jsx("div", { className: "py-lg px-5xl mt-2xs bg-white col-span-12", children: jsx(CreditCardFormStep, { step: step, sections: sections, onNextStep: handleNextStep, onPrevStep: handlePrevStep, isFormFinished: isFormFinished, finishForm: setIsFormFinished }, String(step)) })] }) }));
     });
 
-    const PORTAL_NATURAL_URL = '/';
-    const UPDATING_INTERVAL = 60000 * 4;
-    const updateRefreshToken = () => {
-        const refreshToken = globalThis.sessionStorage?.getItem('refreshToken');
-        const accessToken = globalThis.sessionStorage?.getItem('accessToken');
-        const taskId = globalThis.localStorage.getItem('taskId');
-        if (!accessToken || !refreshToken || !taskId) {
-            globalThis.location.href = PORTAL_NATURAL_URL;
-            return () => null;
-        }
-        const updateTokenRequest = async () => {
-            const res = await doRequest('/auth/refresh', 'POST', {
-                // eslint-disable-next-line camelcase
-                refresh_token: refreshToken,
-                // eslint-disable-next-line camelcase
-                access_token: accessToken,
-            });
-            if (res instanceof Response) {
-                handleStatus(res.status);
-                return;
-            }
-            globalThis.sessionStorage.setItem('refreshToken', res.refresh_token);
-            globalThis.sessionStorage.setItem('accessToken', res.access_token);
-        };
-        updateTokenRequest();
-        const timer = setInterval(updateTokenRequest, UPDATING_INTERVAL);
-        return () => clearInterval(timer);
-    };
-    const handleStatus = (status) => {
-        if (status == 401) {
-            globalThis.location.href = PORTAL_NATURAL_URL;
-        }
-    };
-
     const CreditFormProgress = JSX(({ step = 1, totalSteps = 5, stepsTitles = [] }) => {
         const progress = useMemo(() => (step / totalSteps) * 100, [step, totalSteps]);
         return (jsx("div", { className: "py-lg px-5xl bg-white col-span-12", children: jsxs("div", { children: [jsxs("span", { className: "font-bold mr-s", children: ["\u0428\u0430\u0433 ", step, " \u0438\u0437 ", totalSteps, "."] }), stepsTitles[step] || null, jsx(ProgressBar, { step: progress, showPercentage: false })] }) }));
@@ -7047,8 +7076,8 @@
             dependents: undefined,
             familyMembers: undefined,
             confirmationIncome: { key: '', text: '' },
-            mandatoryIncome: undefined,
-            otherPayments: undefined,
+            wages: undefined,
+            mandatoryPayments: undefined,
             snils: '',
             armyIdFlg: false,
         },
@@ -7197,15 +7226,21 @@
     };
 
     const getThirdStepData = (formData) => {
-        const { familyStatus, dependents, familyMembers, confirmationIncome, mandatoryIncome, otherPayments, snils, armyIdFlg, } = formData;
+        const { familyStatus, dependents, familyMembers, confirmationIncome, wages, mandatoryPayments, incomeAverage, additionalIncome, otherIncome, otherPayments, rentalIncome, retirementIncome, snils, armyIdFlg, } = formData;
         return {
             maritalStatusCd: familyStatus,
             totalDependents: familyMembers,
             incomeCertificateCd: confirmationIncome,
             otherDependents: dependents,
             participantIncomes: getParticipantIncomes({
-                mandatoryIncome,
+                wages,
+                mandatoryPayments,
+                incomeAverage,
+                additionalIncome,
+                otherIncome,
                 otherPayments,
+                rentalIncome,
+                retirementIncome,
             }),
             snils: snils?.replaceAll(' ', ''),
             armyIdFlg,
@@ -7527,11 +7562,11 @@
             },
             {
                 columns: 1,
-                inputs: [{ fieldType: 'common', name: 'mandatoryIncome', required: true }],
+                inputs: [{ fieldType: 'common', name: 'wages', required: true }],
             },
             {
                 columns: 1,
-                inputs: [{ fieldType: 'common', name: 'otherPayments', required: true }],
+                inputs: [{ fieldType: 'common', name: 'mandatoryPayments', required: true }],
             },
             {
                 columns: 1,
@@ -9531,7 +9566,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.663";
+    const packageVersion = "0.14.665";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;