@redneckz/wildless-cms-uni-blocks 0.14.722 → 0.14.724

package/mobile/lib/ui-kit/DraftDialog/utils.js

@@ -1,3 +1,4 @@
+import { countIncomeAverage } from '../../services/retail/adaptors/getFamilyStatusAndIncomeData.js';
 export const creditCodesToProgrammIdMap = {
     credit_cash: '10',
     credit_cash_single_doc: '28',
@@ -23,12 +24,12 @@ export const creditProgramCodeToProductIdMap = {
 export const getParticipantIncomes = (participantIncomes) => {
     const wages = participantIncomes?.find((contact) => contact.incomeTypeCd.key === "WAGES" /* EIncomesType.WAGES */)?.value;
     const mandatoryPayments = participantIncomes?.find((contact) => contact.incomeTypeCd.key === "MANDATORY_PAYMENTS" /* EIncomesType.MANDATORY_PAYMENTS */)?.value;
-    const incomeAverage = participantIncomes?.find((contact) => contact.incomeTypeCd.key === "INCOME_AVERAGE" /* EIncomesType.INCOME_AVERAGE */)?.value;
     const additionalIncome = participantIncomes?.find((contact) => contact.incomeTypeCd.key === "ADDITIONAL_INCOME" /* EIncomesType.ADDITIONAL_INCOME */)?.value;
     const otherIncome = participantIncomes?.find((contact) => contact.incomeTypeCd.key === "OTHER_INCOME" /* EIncomesType.OTHER_INCOME */)?.value;
     const otherPayments = participantIncomes?.find((contact) => contact.incomeTypeCd.key === "OTHER_PAYMENTS" /* EIncomesType.OTHER_PAYMENTS */)?.value;
     const rentalIncome = participantIncomes?.find((contact) => contact.incomeTypeCd.key === "RENTAL_INCOME" /* EIncomesType.RENTAL_INCOME */)?.value;
     const retirementIncome = participantIncomes?.find((contact) => contact.incomeTypeCd.key === "RETIREMENT_INCOME" /* EIncomesType.RETIREMENT_INCOME */)?.value;
+    const incomeAverage = countIncomeAverage(wages, retirementIncome);
     return {
         wages,
         mandatoryPayments,

package/mobile/lib/ui-kit/DraftDialog/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/ui-kit/DraftDialog/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/ui-kit/DraftDialog/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6DAA6D,CAAC;AA6BjG,MAAM,CAAC,MAAM,0BAA0B,GAAG;IACxC,WAAW,EAAE,IAAI;IACjB,sBAAsB,EAAE,IAAI;IAC5B,UAAU,EAAE,IAAI;IAChB,mBAAmB,EAAE,IAAI;IACzB,eAAe,EAAE,IAAI;IACrB,cAAc,EAAE,IAAI;IACpB,UAAU,EAAE,IAAI;IAChB,qBAAqB,EAAE,IAAI;IAC3B,aAAa,EAAE,IAAI;IACnB,WAAW,EAAE,IAAI;IACjB,gBAAgB,EAAE,IAAI;CACvB,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG;IACtC,SAAS,EAAE,IAAI;IACf,UAAU,EAAE,IAAI;IAChB,WAAW,EAAE,IAAI;CAClB,CAAC;AAEF,MAAM,CAAC,MAAM,+BAA+B,GAAG;IAC7C,GAAG,0BAA0B;IAC7B,GAAG,wBAAwB;CAC5B,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,kBAAqD,EAAE,EAAE;IAC7F,MAAM,KAAK,GAAG,kBAAkB,EAAE,IAAI,CACpC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,qCAAuB,CAC7D,EAAE,KAAK,CAAC;IACT,MAAM,iBAAiB,GAAG,kBAAkB,EAAE,IAAI,CAChD,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,+DAAoC,CAC1E,EAAE,KAAK,CAAC;IACT,MAAM,gBAAgB,GAAG,kBAAkB,EAAE,IAAI,CAC/C,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,6DAAmC,CACzE,EAAE,KAAK,CAAC;IACT,MAAM,WAAW,GAAG,kBAAkB,EAAE,IAAI,CAC1C,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,mDAA8B,CACpE,EAAE,KAAK,CAAC;IACT,MAAM,aAAa,GAAG,kBAAkB,EAAE,IAAI,CAC5C,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,uDAAgC,CACtE,EAAE,KAAK,CAAC;IACT,MAAM,YAAY,GAAG,kBAAkB,EAAE,IAAI,CAC3C,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,qDAA+B,CACrE,EAAE,KAAK,CAAC;IACT,MAAM,gBAAgB,GAAG,kBAAkB,EAAE,IAAI,CAC/C,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,6DAAmC,CACzE,EAAE,KAAK,CAAC;IACT,MAAM,aAAa,GAAG,kBAAkB,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;IAElE,OAAO;QACL,KAAK;QACL,iBAAiB;QACjB,aAAa;QACb,gBAAgB;QAChB,WAAW;QACX,aAAa;QACb,YAAY;QACZ,gBAAgB;KACjB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,oBAAyD,EACzD,EAAE;IACF,MAAM,mBAAmB,GAAG,oBAAoB,EAAE,IAAI,CACpD,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,mDAA8B,CACnE,CAAC;IACF,MAAM,WAAW,GAAG,oBAAoB,EAAE,IAAI,CAC5C,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,+CAA4B,CACjE,CAAC;IACF,MAAM,mBAAmB,GAAG,oBAAoB,EAAE,IAAI,CACpD,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,mCAAsB,CAC3D,CAAC;IAEF,OAAO;QACL,mBAAmB;QACnB,WAAW;QACX,mBAAmB;KACpB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,mBAAuD,EAAE,EAAE;IAChG,MAAM,KAAK,GAAG,mBAAmB,EAAE,IAAI,CACrC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,qCAAuB,CAC9D,EAAE,KAAK,CAAC;IACT,MAAM,KAAK,GAAG,mBAAmB,EAAE,IAAI,CACrC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,8CAA2B,CAClE,EAAE,KAAK,CAAC;IACT,MAAM,iBAAiB,GAAG,mBAAmB,EAAE,IAAI,CACjD,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,8DAAmC,CAC1E,EAAE,KAAK,CAAC;IAET,OAAO;QACL,KAAK;QACL,KAAK;QACL,iBAAiB;KAClB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,MAA+B,EAAE,EAAE;IACtE,OAAO,MAAM,EAAE,GAAG;QAChB,CAAC,CAAC;YACE,GAAG,EAAE,MAAM,CAAC,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ;SAC9C;QACH,CAAC,CAAC,IAAI,CAAC;AACX,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAkB,EAAsB,EAAE;IACvE,OAAO,MAAM,EAAE,GAAG;QAChB,CAAC,CAAC;YACE,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,IAAI,EAAE,MAAM,CAAC,KAAK;SACnB;QACH,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC,CAAC"}

package/mobile/lib/ui-kit/FormField/Fields/RetirementIncomeField.js

@@ -1,16 +1,7 @@
 import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { InputControl } from '../../Input/InputControl.js';
 import { validatorObj } from '../getObjectValidator.js';
 import { getValidation } from '../getValidation.js';
-export 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", isInteger: true, ...getValidation(field('retirementIncome'), validatorObj.retirementIncome, input?.required), ...input, onChange: onChange }));
-});
+export 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", isInteger: true, ...getValidation(field('retirementIncome'), validatorObj.retirementIncome, input?.required), ...input })));
 //# sourceMappingURL=RetirementIncomeField.js.map

package/mobile/lib/ui-kit/FormField/Fields/RetirementIncomeField.js.map

@@ -1 +1 @@
-{"version":3,"file":"RetirementIncomeField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/RetirementIncomeField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,CAAC,MAAM,qBAAqB,GAAG,GAAG,CAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IAC9E,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC;IAE3C,MAAM,QAAQ,GAAG,WAAW,CAC1B,CAAC,CAAS,EAAE,EAAE;QACZ,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,YAAY,IAAI,CAAC,CAAC,CAAC;QAEzD,KAAK,CAAC,kBAAkB,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;QACzC,KAAK,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;IACzD,CAAC,EACD,CAAC,YAAY,CAAC,CACf,CAAC;IAEF,OAAO,CACL,KAAC,YAAY,IACX,KAAK,EAAC,mGAAmB,EACzB,WAAW,EAAC,6FAAkB,EAC9B,SAAS,EAAE,IAAI,KACX,aAAa,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,YAAY,CAAC,gBAAgB,EAAE,KAAK,EAAE,QAAQ,CAAC,KACxF,KAAK,EACT,QAAQ,EAAE,QAAQ,GAClB,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"RetirementIncomeField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/RetirementIncomeField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,CAAC,MAAM,qBAAqB,GAAG,GAAG,CAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAC/E,KAAC,YAAY,IACX,KAAK,EAAC,mGAAmB,EACzB,WAAW,EAAC,6FAAkB,EAC9B,SAAS,EAAE,IAAI,KACX,aAAa,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,YAAY,CAAC,gBAAgB,EAAE,KAAK,EAAE,QAAQ,CAAC,KACxF,KAAK,GACT,CACH,CAAC,CAAC"}

package/mobile/lib/ui-kit/FormField/Fields/WagesField.js

@@ -1,16 +1,7 @@
 import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { InputControl } from '../../Input/InputControl.js';
 import { validatorObj } from '../getObjectValidator.js';
 import { getValidation } from '../getValidation.js';
-export 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", isInteger: true, ...getValidation(field('wages'), validatorObj.wages, input?.required), ...input, onChange: onChange }));
-});
+export const WagesField = 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", isInteger: true, ...getValidation(field('wages'), validatorObj.wages, input?.required), ...input })));
 //# sourceMappingURL=WagesField.js.map

package/mobile/lib/ui-kit/FormField/Fields/WagesField.js.map

@@ -1 +1 @@
-{"version":3,"file":"WagesField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/WagesField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IACnE,MAAM,uBAAuB,GAAG,KAAK,CAAC,kBAAkB,CAAC,EAAE,KAAK,CAAC;IAEjE,MAAM,QAAQ,GAAG,WAAW,CAC1B,CAAC,CAAS,EAAE,EAAE;QACZ,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,uBAAuB,IAAI,CAAC,CAAC,CAAC;QAEpE,KAAK,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;QAC9B,KAAK,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;IACzD,CAAC,EACD,CAAC,uBAAuB,CAAC,CAC1B,CAAC;IAEF,OAAO,CACL,KAAC,YAAY,IACX,KAAK,EAAC,2UAAkE,EACxE,WAAW,EAAC,6FAAkB,EAC9B,SAAS,EAAE,IAAI,KACX,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,KAClE,KAAK,EACT,QAAQ,EAAE,QAAQ,GAClB,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"WagesField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/WagesField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CACpE,KAAC,YAAY,IACX,KAAK,EAAC,2UAAkE,EACxE,WAAW,EAAC,6FAAkB,EAC9B,SAAS,EAAE,IAAI,KACX,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,KAClE,KAAK,GACT,CACH,CAAC,CAAC"}

package/mobile/lib/ui-kit/FormField/NameFieldDef.d.ts

@@ -1 +1 @@
-export declare type NameFieldDef = 'surname' | 'name' | 'middleName' | 'education' | 'housing' | 'employment' | 'organization' | 'organizationPhone' | 'organizationAddress' | 'amountWorkers' | 'employerActivities' | 'employerOrganization' | 'positionOrganization' | 'dulSerie' | 'dulNumber' | 'dulIssueDateField' | 'dulSubdivisionCode' | 'dulIssuedBy' | 'email' | 'phone' | 'fullName' | 'inn' | 'comment' | 'region' | 'addressBranch' | 'typeForm' | 'registrationDate' | 'birthday' | 'limitedBirthday' | 'birthPlace' | 'sex' | 'isClient' | 'consentToReceiveMaterials' | 'acquiringType' | 'onlineCheckout' | 'posTerminal' | 'serviceDirection' | 'serviceType' | 'feedbackMethod' | 'bankEmpolee' | 'applicationDate' | 'secondaryPhone' | 'vedTypes' | 'term' | 'amount' | 'annualRevenue' | 'collectionCount' | 'desiredMeetingDate' | 'product' | 'localities' | 'partnerComments' | 'consentDataProcessing' | 'consentInformFlg' | 'consentOthersFlg' | 'consentPfrFlg' | 'consentProviderFlg' | 'processPersonalDataFlg' | 'legalForm' | 'organizationName' | 'generalSeniority' | 'lastJobExperience' | 'experience5Years' | 'jobsNumber' | 'beginDate' | 'addressFact' | 'familyStatus' | 'children' | 'familyMembers' | 'dependents' | 'totalIncome' | 'expenses' | 'snils' | 'conscription' | 'armyIdFlg' | 'addressRegistration' | 'participantDateRegistration' | 'retirementIncome' | 'otherIncome' | 'incomeAverage' | 'mandatoryPayments' | 'additionalIncome' | 'otherPayments' | 'rentalIncome' | 'wages' | 'creditInRshbCd' | 'disablePeopleFlg' | 'bankruptcyFlg' | 'shareholderFlg' | 'legalEntityName' | 'bankEmployeeCode' | 'partInBusiness' | 'regionRetail' | 'addressRetail' | 'addressMatch' | 'addressCourier' | 'deliveryDate' | 'methodObtain' | 'paymentSystem' | 'currency' | 'cardCategory' | 'codeWord' | 'calculator' | 'confirmationIncome';
+export declare type NameFieldDef = 'surname' | 'name' | 'middleName' | 'education' | 'housing' | 'employment' | 'organization' | 'organizationPhone' | 'organizationAddress' | 'amountWorkers' | 'employerActivities' | 'employerOrganization' | 'positionOrganization' | 'dulSerie' | 'dulNumber' | 'dulIssueDateField' | 'dulSubdivisionCode' | 'dulIssuedBy' | 'email' | 'phone' | 'fullName' | 'inn' | 'comment' | 'region' | 'addressBranch' | 'typeForm' | 'registrationDate' | 'birthday' | 'limitedBirthday' | 'birthPlace' | 'sex' | 'isClient' | 'consentToReceiveMaterials' | 'acquiringType' | 'onlineCheckout' | 'posTerminal' | 'serviceDirection' | 'serviceType' | 'feedbackMethod' | 'bankEmpolee' | 'applicationDate' | 'secondaryPhone' | 'vedTypes' | 'term' | 'amount' | 'annualRevenue' | 'collectionCount' | 'desiredMeetingDate' | 'product' | 'localities' | 'partnerComments' | 'consentDataProcessing' | 'consentInformFlg' | 'consentOthersFlg' | 'consentPfrFlg' | 'consentProviderFlg' | 'processPersonalDataFlg' | 'legalForm' | 'organizationName' | 'generalSeniority' | 'lastJobExperience' | 'experience5Years' | 'jobsNumber' | 'beginDate' | 'addressFact' | 'familyStatus' | 'children' | 'familyMembers' | 'dependents' | 'totalIncome' | 'expenses' | 'snils' | 'conscription' | 'armyIdFlg' | 'addressRegistration' | 'participantDateRegistration' | 'retirementIncome' | 'otherIncome' | 'mandatoryPayments' | 'additionalIncome' | 'otherPayments' | 'rentalIncome' | 'wages' | 'creditInRshbCd' | 'disablePeopleFlg' | 'bankruptcyFlg' | 'shareholderFlg' | 'legalEntityName' | 'bankEmployeeCode' | 'partInBusiness' | 'regionRetail' | 'addressRetail' | 'addressMatch' | 'addressCourier' | 'deliveryDate' | 'methodObtain' | 'paymentSystem' | 'currency' | 'cardCategory' | 'codeWord' | 'calculator' | 'confirmationIncome';

package/mobile/src/components/ApplicationLeadForm/LeadFormState.ts

@@ -117,7 +117,6 @@ export interface LeadFormState extends FormConsents, FormStateDeliveryType {
   participantDateRegistration?: Date | string;
   retirementIncome?: number;
   otherIncome?: number;
-  incomeAverage?: number;
   mandatoryPayments?: number;
   additionalIncome?: number;
   otherPayments?: number;

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

@@ -8,7 +8,7 @@ import { type VNode } from '../../model/VNode';
 import { FailedStatusContent } from './FailedStatusContent';
 import { PendingStatusContent } from './PendingStatusContent';
 import { ReworkStatusContent } from './ReworkStatusContent';
-import { SuccessStatusContent } from './SuccessStatusContent';
+import { SuccessStatusCardContent } from './SuccessStatusCardContent';
 
 const SIGNAL_TYPES: SignalType[] = [
   'CREATE_APPLICATION_SHORT_SIGNAL',
@@ -52,8 +52,8 @@ const renderStatus = (status: STATUS_TYPE, handleExpire: () => void) => {
     CANCELLED: <FailedStatusContent />,
     FAILED: <FailedStatusContent />,
     DRAFT: <FailedStatusContent />,
-    APPROVED: <SuccessStatusContent />,
-    PRE_DECISION: <SuccessStatusContent />,
+    APPROVED: <SuccessStatusCardContent />,
+    PRE_DECISION: <SuccessStatusCardContent />,
     REVISION: <ReworkStatusContent />,
   };
 

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

@@ -0,0 +1,45 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useRetailFormStore, type StatusInfoState } from '../../hooks/useRetailFormStore';
+import { formatDate } from '../../utils/formatDate';
+import { CreditCardFormStatus } from './CreditCardFormStatus';
+
+export const SuccessStatusCardContent = JSX(() => {
+  const { statusInfo } = useRetailFormStore();
+
+  return (
+    <CreditCardFormStatus
+      title="Банк одобрил вам кредит"
+      description="Обратитесь в отделение банка, чтобы завершить оформление и получит ваш кредит"
+      sectionInfo={getSectionInfo(statusInfo)}
+      buttonText="Вернуться на главную"
+    />
+  );
+});
+
+const getSectionInfo = (statusInfo: StatusInfoState | null) => {
+  const sectionInfo = [
+    {
+      label: 'Название продукта',
+      description: 'Кредитная карта',
+    },
+    {
+      label: 'Категория',
+      description: statusInfo?.cardCategory,
+    },
+  ];
+
+  if (statusInfo?.deliveryAddress && statusInfo?.deliveryDate) {
+    return sectionInfo.concat([
+      {
+        label: 'Адрес доставки',
+        description: statusInfo?.deliveryAddress,
+      },
+      {
+        label: 'Дата доставки',
+        description: formatDate(statusInfo?.deliveryDate),
+      },
+    ]);
+  }
+
+  return sectionInfo;
+};

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

@@ -40,12 +40,9 @@ export const useCreditCardFormAPI = ({
         retailFormStore.statusInfo = {
           regionRetail: leadForm?.regionRetail?.text,
           addressRetail: leadForm?.addressRetail?.text,
+          deliveryAddress: leadForm?.addressCourier?.fullAddress,
           cardCategory: leadForm?.cardCategory?.text,
-          calculator: {
-            monthsValue: leadForm?.calculator?.monthsValue,
-            moneyValue: leadForm?.calculator?.moneyValue,
-            isAnnuity: leadForm?.calculator?.isAnnuity,
-          },
+          deliveryDate: leadForm?.deliveryDate,
         };
         retailFormStore.leadForm = initialState;
       }

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

@@ -41,7 +41,6 @@ export const useCreditFormAPI = ({
         retailFormStore.statusInfo = {
           regionRetail: leadForm?.regionRetail?.text,
           addressRetail: leadForm?.addressRetail?.text,
-          cardCategory: leadForm?.cardCategory?.text,
           calculator: {
             monthsValue: leadForm?.calculator?.monthsValue,
             moneyValue: leadForm?.calculator?.moneyValue,

package/mobile/src/hooks/useRetailFormStore.tsx

@@ -6,6 +6,8 @@ export type StatusInfoState = {
   regionRetail?: string;
   addressRetail?: string;
   cardCategory?: string;
+  deliveryDate?: Date | string;
+  deliveryAddress?: string;
   calculator?: {
     monthsValue?: number;
     moneyValue?: number;

package/mobile/src/services/retail/adaptors/getFamilyStatusAndIncomeData.ts

@@ -11,7 +11,6 @@ export const getFamilyStatusAndIncomeData = (formData: LeadFormState): Partial<P
     confirmationIncome,
     wages,
     mandatoryPayments,
-    incomeAverage,
     additionalIncome,
     otherIncome,
     otherPayments,
@@ -32,7 +31,7 @@ export const getFamilyStatusAndIncomeData = (formData: LeadFormState): Partial<P
     participantIncomes: getParticipantIncomes({
       wages,
       mandatoryPayments,
-      incomeAverage,
+      incomeAverage: countIncomeAverage(wages, retirementIncome),
       additionalIncome,
       otherIncome,
       otherPayments,
@@ -43,3 +42,6 @@ export const getFamilyStatusAndIncomeData = (formData: LeadFormState): Partial<P
     armyIdFlg,
   };
 };
+
+export const countIncomeAverage = (wages?: number, retirementIncome?: number) =>
+  Number(wages) + Number(retirementIncome);

package/mobile/src/ui-kit/DraftDialog/utils.ts

@@ -1,6 +1,7 @@
 /* eslint-disable camelcase */
 import { type LeadProps } from '../../api/RetailAPI/model/LeadFormData';
 import { type Participant } from '../../api/RetailAPI/updateUserTask';
+import { countIncomeAverage } from '../../services/retail/adaptors/getFamilyStatusAndIncomeData';
 import { type Option } from '../Select/Option';
 
 export const enum EContactType {
@@ -61,9 +62,6 @@ export const getParticipantIncomes = (participantIncomes: Participant['participa
   const mandatoryPayments = participantIncomes?.find(
     (contact) => contact.incomeTypeCd.key === EIncomesType.MANDATORY_PAYMENTS,
   )?.value;
-  const incomeAverage = participantIncomes?.find(
-    (contact) => contact.incomeTypeCd.key === EIncomesType.INCOME_AVERAGE,
-  )?.value;
   const additionalIncome = participantIncomes?.find(
     (contact) => contact.incomeTypeCd.key === EIncomesType.ADDITIONAL_INCOME,
   )?.value;
@@ -79,6 +77,7 @@ export const getParticipantIncomes = (participantIncomes: Participant['participa
   const retirementIncome = participantIncomes?.find(
     (contact) => contact.incomeTypeCd.key === EIncomesType.RETIREMENT_INCOME,
   )?.value;
+  const incomeAverage = countIncomeAverage(wages, retirementIncome);
 
   return {
     wages,

package/mobile/src/ui-kit/FormField/Fields/RetirementIncomeField.tsx

@@ -1,31 +1,15 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { InputControl } from '../../Input/InputControl';
 import type { CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const RetirementIncomeField = JSX<CustomFieldProps>(({ field, input }) => {
-  const currentWages = field('wages')?.value;
-
-  const onChange = useCallback(
-    (_: string) => {
-      const incomesSum = Number(_) + Number(currentWages || 0);
-
-      field('retirementIncome')?.onChange?.(_);
-      field('incomeAverage')?.onChange?.(String(incomesSum));
-    },
-    [currentWages],
-  );
-
-  return (
-    <InputControl
-      label="Пенсионные доходы"
-      placeholder="Введите значение"
-      isInteger={true}
-      {...getValidation(field('retirementIncome'), validatorObj.retirementIncome, input?.required)}
-      {...input}
-      onChange={onChange}
-    />
-  );
-});
+export const RetirementIncomeField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="Пенсионные доходы"
+    placeholder="Введите значение"
+    isInteger={true}
+    {...getValidation(field('retirementIncome'), validatorObj.retirementIncome, input?.required)}
+    {...input}
+  />
+));

package/mobile/src/ui-kit/FormField/Fields/WagesField.tsx

@@ -1,31 +1,15 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { InputControl } from '../../Input/InputControl';
 import type { CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const WagesField = JSX<CustomFieldProps>(({ field, input }) => {
-  const currentRetirementIncome = field('retirementIncome')?.value;
-
-  const onChange = useCallback(
-    (_: string) => {
-      const incomesSum = Number(_) + Number(currentRetirementIncome || 0);
-
-      field('wages')?.onChange?.(_);
-      field('incomeAverage')?.onChange?.(String(incomesSum));
-    },
-    [currentRetirementIncome],
-  );
-
-  return (
-    <InputControl
-      label="Совокупный доход в месяц после вычета налогов (зарплата, премии)"
-      placeholder="Введите значение"
-      isInteger={true}
-      {...getValidation(field('wages'), validatorObj.wages, input?.required)}
-      {...input}
-      onChange={onChange}
-    />
-  );
-});
+export const WagesField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="Совокупный доход в месяц после вычета налогов (зарплата, премии)"
+    placeholder="Введите значение"
+    isInteger={true}
+    {...getValidation(field('wages'), validatorObj.wages, input?.required)}
+    {...input}
+  />
+));

package/mobile/src/ui-kit/FormField/NameFieldDef.ts

@@ -77,7 +77,6 @@ export type NameFieldDef =
   | 'participantDateRegistration'
   | 'retirementIncome'
   | 'otherIncome'
-  | 'incomeAverage'
   | 'mandatoryPayments'
   | 'additionalIncome'
   | 'otherPayments'

package/package.json

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

package/src/components/ApplicationLeadForm/LeadFormState.ts

@@ -117,7 +117,6 @@ export interface LeadFormState extends FormConsents, FormStateDeliveryType {
   participantDateRegistration?: Date | string;
   retirementIncome?: number;
   otherIncome?: number;
-  incomeAverage?: number;
   mandatoryPayments?: number;
   additionalIncome?: number;
   otherPayments?: number;

package/src/components/CreditCardForm/CreditCardFormStatusTracker.tsx

@@ -8,7 +8,7 @@ import { type VNode } from '../../model/VNode';
 import { FailedStatusContent } from './FailedStatusContent';
 import { PendingStatusContent } from './PendingStatusContent';
 import { ReworkStatusContent } from './ReworkStatusContent';
-import { SuccessStatusContent } from './SuccessStatusContent';
+import { SuccessStatusCardContent } from './SuccessStatusCardContent';
 
 const SIGNAL_TYPES: SignalType[] = [
   'CREATE_APPLICATION_SHORT_SIGNAL',
@@ -52,8 +52,8 @@ const renderStatus = (status: STATUS_TYPE, handleExpire: () => void) => {
     CANCELLED: <FailedStatusContent />,
     FAILED: <FailedStatusContent />,
     DRAFT: <FailedStatusContent />,
-    APPROVED: <SuccessStatusContent />,
-    PRE_DECISION: <SuccessStatusContent />,
+    APPROVED: <SuccessStatusCardContent />,
+    PRE_DECISION: <SuccessStatusCardContent />,
     REVISION: <ReworkStatusContent />,
   };
 

package/src/components/CreditCardForm/SuccessStatusCardContent.tsx

@@ -0,0 +1,45 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useRetailFormStore, type StatusInfoState } from '../../hooks/useRetailFormStore';
+import { formatDate } from '../../utils/formatDate';
+import { CreditCardFormStatus } from './CreditCardFormStatus';
+
+export const SuccessStatusCardContent = JSX(() => {
+  const { statusInfo } = useRetailFormStore();
+
+  return (
+    <CreditCardFormStatus
+      title="Банк одобрил вам кредит"
+      description="Обратитесь в отделение банка, чтобы завершить оформление и получит ваш кредит"
+      sectionInfo={getSectionInfo(statusInfo)}
+      buttonText="Вернуться на главную"
+    />
+  );
+});
+
+const getSectionInfo = (statusInfo: StatusInfoState | null) => {
+  const sectionInfo = [
+    {
+      label: 'Название продукта',
+      description: 'Кредитная карта',
+    },
+    {
+      label: 'Категория',
+      description: statusInfo?.cardCategory,
+    },
+  ];
+
+  if (statusInfo?.deliveryAddress && statusInfo?.deliveryDate) {
+    return sectionInfo.concat([
+      {
+        label: 'Адрес доставки',
+        description: statusInfo?.deliveryAddress,
+      },
+      {
+        label: 'Дата доставки',
+        description: formatDate(statusInfo?.deliveryDate),
+      },
+    ]);
+  }
+
+  return sectionInfo;
+};

package/src/components/CreditCardForm/useCreditCardFormAPI.tsx

@@ -40,12 +40,9 @@ export const useCreditCardFormAPI = ({
         retailFormStore.statusInfo = {
           regionRetail: leadForm?.regionRetail?.text,
           addressRetail: leadForm?.addressRetail?.text,
+          deliveryAddress: leadForm?.addressCourier?.fullAddress,
           cardCategory: leadForm?.cardCategory?.text,
-          calculator: {
-            monthsValue: leadForm?.calculator?.monthsValue,
-            moneyValue: leadForm?.calculator?.moneyValue,
-            isAnnuity: leadForm?.calculator?.isAnnuity,
-          },
+          deliveryDate: leadForm?.deliveryDate,
         };
         retailFormStore.leadForm = initialState;
       }

package/src/components/CreditForm/useCreditFormAPI.tsx

@@ -41,7 +41,6 @@ export const useCreditFormAPI = ({
         retailFormStore.statusInfo = {
           regionRetail: leadForm?.regionRetail?.text,
           addressRetail: leadForm?.addressRetail?.text,
-          cardCategory: leadForm?.cardCategory?.text,
           calculator: {
             monthsValue: leadForm?.calculator?.monthsValue,
             moneyValue: leadForm?.calculator?.moneyValue,

package/src/hooks/useRetailFormStore.tsx

@@ -6,6 +6,8 @@ export type StatusInfoState = {
   regionRetail?: string;
   addressRetail?: string;
   cardCategory?: string;
+  deliveryDate?: Date | string;
+  deliveryAddress?: string;
   calculator?: {
     monthsValue?: number;
     moneyValue?: number;

package/src/services/retail/adaptors/getFamilyStatusAndIncomeData.ts

@@ -11,7 +11,6 @@ export const getFamilyStatusAndIncomeData = (formData: LeadFormState): Partial<P
     confirmationIncome,
     wages,
     mandatoryPayments,
-    incomeAverage,
     additionalIncome,
     otherIncome,
     otherPayments,
@@ -32,7 +31,7 @@ export const getFamilyStatusAndIncomeData = (formData: LeadFormState): Partial<P
     participantIncomes: getParticipantIncomes({
       wages,
       mandatoryPayments,
-      incomeAverage,
+      incomeAverage: countIncomeAverage(wages, retirementIncome),
       additionalIncome,
       otherIncome,
       otherPayments,
@@ -43,3 +42,6 @@ export const getFamilyStatusAndIncomeData = (formData: LeadFormState): Partial<P
     armyIdFlg,
   };
 };
+
+export const countIncomeAverage = (wages?: number, retirementIncome?: number) =>
+  Number(wages) + Number(retirementIncome);

package/src/ui-kit/DraftDialog/utils.ts

@@ -1,6 +1,7 @@
 /* eslint-disable camelcase */
 import { type LeadProps } from '../../api/RetailAPI/model/LeadFormData';
 import { type Participant } from '../../api/RetailAPI/updateUserTask';
+import { countIncomeAverage } from '../../services/retail/adaptors/getFamilyStatusAndIncomeData';
 import { type Option } from '../Select/Option';
 
 export const enum EContactType {
@@ -61,9 +62,6 @@ export const getParticipantIncomes = (participantIncomes: Participant['participa
   const mandatoryPayments = participantIncomes?.find(
     (contact) => contact.incomeTypeCd.key === EIncomesType.MANDATORY_PAYMENTS,
   )?.value;
-  const incomeAverage = participantIncomes?.find(
-    (contact) => contact.incomeTypeCd.key === EIncomesType.INCOME_AVERAGE,
-  )?.value;
   const additionalIncome = participantIncomes?.find(
     (contact) => contact.incomeTypeCd.key === EIncomesType.ADDITIONAL_INCOME,
   )?.value;
@@ -79,6 +77,7 @@ export const getParticipantIncomes = (participantIncomes: Participant['participa
   const retirementIncome = participantIncomes?.find(
     (contact) => contact.incomeTypeCd.key === EIncomesType.RETIREMENT_INCOME,
   )?.value;
+  const incomeAverage = countIncomeAverage(wages, retirementIncome);
 
   return {
     wages,

package/src/ui-kit/FormField/Fields/RetirementIncomeField.tsx

@@ -1,31 +1,15 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { InputControl } from '../../Input/InputControl';
 import type { CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const RetirementIncomeField = JSX<CustomFieldProps>(({ field, input }) => {
-  const currentWages = field('wages')?.value;
-
-  const onChange = useCallback(
-    (_: string) => {
-      const incomesSum = Number(_) + Number(currentWages || 0);
-
-      field('retirementIncome')?.onChange?.(_);
-      field('incomeAverage')?.onChange?.(String(incomesSum));
-    },
-    [currentWages],
-  );
-
-  return (
-    <InputControl
-      label="Пенсионные доходы"
-      placeholder="Введите значение"
-      isInteger={true}
-      {...getValidation(field('retirementIncome'), validatorObj.retirementIncome, input?.required)}
-      {...input}
-      onChange={onChange}
-    />
-  );
-});
+export const RetirementIncomeField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="Пенсионные доходы"
+    placeholder="Введите значение"
+    isInteger={true}
+    {...getValidation(field('retirementIncome'), validatorObj.retirementIncome, input?.required)}
+    {...input}
+  />
+));

package/src/ui-kit/FormField/Fields/WagesField.tsx

@@ -1,31 +1,15 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { InputControl } from '../../Input/InputControl';
 import type { CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const WagesField = JSX<CustomFieldProps>(({ field, input }) => {
-  const currentRetirementIncome = field('retirementIncome')?.value;
-
-  const onChange = useCallback(
-    (_: string) => {
-      const incomesSum = Number(_) + Number(currentRetirementIncome || 0);
-
-      field('wages')?.onChange?.(_);
-      field('incomeAverage')?.onChange?.(String(incomesSum));
-    },
-    [currentRetirementIncome],
-  );
-
-  return (
-    <InputControl
-      label="Совокупный доход в месяц после вычета налогов (зарплата, премии)"
-      placeholder="Введите значение"
-      isInteger={true}
-      {...getValidation(field('wages'), validatorObj.wages, input?.required)}
-      {...input}
-      onChange={onChange}
-    />
-  );
-});
+export const WagesField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="Совокупный доход в месяц после вычета налогов (зарплата, премии)"
+    placeholder="Введите значение"
+    isInteger={true}
+    {...getValidation(field('wages'), validatorObj.wages, input?.required)}
+    {...input}
+  />
+));

package/src/ui-kit/FormField/NameFieldDef.ts

@@ -77,7 +77,6 @@ export type NameFieldDef =
   | 'participantDateRegistration'
   | 'retirementIncome'
   | 'otherIncome'
-  | 'incomeAverage'
   | 'mandatoryPayments'
   | 'additionalIncome'
   | 'otherPayments'

package/bundle/components/CreditCardForm/SuccessStatusContent.d.ts

@@ -1 +0,0 @@
-export declare const SuccessStatusContent: import("@redneckz/uni-jsx").UNIComponent<{}, any, any>;

package/dist/components/CreditCardForm/SuccessStatusContent.d.ts

@@ -1 +0,0 @@
-export declare const SuccessStatusContent: import("@redneckz/uni-jsx").UNIComponent<{}, any, any>;