@redneckz/wildless-cms-uni-blocks 0.14.681 → 0.14.682

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

@@ -1,10 +1,12 @@
 import { type Participant } from '../../api/RetailAPI/updateUserTask';
+import { formatDate } from '../../utils/formatDate';
 import { formatPhone } from '../../utils/formatPhone';
 import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
 import { getParticipantAddresses, getParticipantContacts } from './utils';
 
 export const getSecondStepData = (formData: FormState): Partial<Participant> => {
   const {
+    beginDate,
     employment,
     organizationName,
     inn,
@@ -23,6 +25,7 @@ export const getSecondStepData = (formData: FormState): Partial<Participant> =>
   } = formData;
 
   return {
+    employmentContractDate: formatDate(beginDate || '', true),
     employmentTypeCd: employment,
     organizationName,
     organizationInn: inn,

package/mobile/src/components/CreditForm/getThirdStepData.ts

@@ -7,6 +7,7 @@ export const getThirdStepData = (formData: FormState): Partial<Participant> => {
     familyStatus,
     dependents,
     familyMembers,
+    children,
     confirmationIncome,
     wages,
     mandatoryPayments,
@@ -18,6 +19,7 @@ export const getThirdStepData = (formData: FormState): Partial<Participant> => {
     retirementIncome,
     snils,
     armyIdFlg,
+    conscription,
   } = formData;
 
   return {
@@ -25,6 +27,8 @@ export const getThirdStepData = (formData: FormState): Partial<Participant> => {
     totalDependents: familyMembers,
     incomeCertificateCd: confirmationIncome,
     otherDependents: dependents,
+    childrenDependents: children,
+    militaryStatusCd: conscription,
     participantIncomes: getParticipantIncomes({
       wages,
       mandatoryPayments,

package/package.json

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

package/src/api/RetailAPI/updateUserTask.ts

@@ -52,6 +52,7 @@ export type Participant = {
   };
   armyIdFlg?: boolean;
   birthPlace?: string;
+  childrenDependents?: number;
   genderCd?: Option;
   dulIssueDate?: string;
   dulIssuedBy?: string;

package/src/components/ApplicationLeadForm/getInitialFormState.tsx

@@ -118,7 +118,7 @@ export interface FormState extends FormConsents, FormStateDeliveryType {
   totalIncome?: number;
   expenses?: number;
   snils?: string;
-  conscription?: string;
+  conscription?: Option;
   armyIdFlg?: boolean;
   addressRegistration?: Address;
   participantDateRegistration?: Date | string;

package/src/components/CreditCardForm/getCreditCardFormTaskData.ts

@@ -5,7 +5,7 @@ import { getFifthStepData } from './getFifthStepData';
 import { getFirstStepData } from './getFirstStepData';
 import { getFourthStepData } from './getFourthStepData';
 import { getSecondStepData } from './getSecondStepData';
-import { getDeliveryData, getSixthStepData } from './getSixthStepData';
+import { getDeliveryData, getOfficeCode, getSixthStepData } from './getSixthStepData';
 import { getThirdStepData } from './getThirdStepData';
 
 type getCreditCardFormTaskDataProps = {
@@ -31,9 +31,7 @@ export const getCreditCardFormTaskData = ({
     task: {
       taskSource: navigator.origin,
       id: taskId,
-      office: {
-        id: '650', // TODO: Remove hardcode
-      },
+      ...getOfficeCode(formData),
       authorizedAgentId: formData?.bankEmployeeCode,
       participants: [
         {

package/src/components/CreditCardForm/getFourthStepData.ts

@@ -7,6 +7,7 @@ export const getFourthStepData = (formData: FormState): Partial<Participant> =>
     familyStatus,
     dependents,
     familyMembers,
+    children,
     wages,
     mandatoryPayments,
     incomeAverage,
@@ -17,12 +18,15 @@ export const getFourthStepData = (formData: FormState): Partial<Participant> =>
     retirementIncome,
     snils,
     armyIdFlg,
+    conscription,
   } = formData;
 
   return {
     maritalStatusCd: familyStatus,
+    childrenDependents: children,
     totalDependents: familyMembers,
     otherDependents: dependents,
+    militaryStatusCd: conscription,
     participantIncomes: getParticipantIncomes({
       wages,
       mandatoryPayments,

package/src/components/CreditCardForm/getSixthStepData.ts

@@ -12,6 +12,14 @@ export const getDeliveryData = (formData: FormState) => {
   };
 };
 
+export const getOfficeCode = (formData: FormState) => {
+  const { addressRetail } = formData;
+
+  return {
+    office: addressRetail?.key ? { id: addressRetail.key } : undefined,
+  };
+};
+
 export const getSixthStepData = (formData: FormState) => {
   const { addressCourier } = formData;
 

package/src/components/CreditCardForm/getThirdStepData.tsx

@@ -1,10 +1,12 @@
 import { type Participant } from '../../api/RetailAPI/updateUserTask';
+import { formatDate } from '../../utils/formatDate';
 import { formatPhone } from '../../utils/formatPhone';
 import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
 import { getParticipantAddresses, getParticipantContacts } from '../CreditForm/utils';
 
 export const getThirdStepData = (formData: FormState): Partial<Participant> => {
   const {
+    beginDate,
     employment,
     organizationName,
     inn,
@@ -23,6 +25,7 @@ export const getThirdStepData = (formData: FormState): Partial<Participant> => {
   } = formData;
 
   return {
+    employmentContractDate: formatDate(beginDate || '', true),
     employmentTypeCd: employment,
     organizationName,
     organizationInn: inn,

package/src/components/CreditCardForm/useCreditCardFormAPI.tsx

@@ -32,7 +32,7 @@ export const useCreditCardFormAPI = ({
     const feedbackValidator = objectValidator(
       getObjectValidator(calculateInputs(getValue(formData))(inputs, step)),
     );
-    console.log(getObjectValidator(calculateInputs(getValue(formData))(inputs, step)));
+
     if (!isValidationSuccess(feedbackValidator(formData))) {
       return console.warn('validation fail');
     }

package/src/components/CreditForm/getCreditFormTaskData.ts

@@ -31,9 +31,6 @@ export const getCreditFormTaskData = ({
     task: {
       taskSource: navigator.origin,
       id: taskId,
-      office: {
-        id: '',
-      },
       authorizedAgentId: formData?.bankEmployeeCode,
       participants: [
         {

package/src/components/CreditForm/getSecondStepData.tsx

@@ -1,10 +1,12 @@
 import { type Participant } from '../../api/RetailAPI/updateUserTask';
+import { formatDate } from '../../utils/formatDate';
 import { formatPhone } from '../../utils/formatPhone';
 import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
 import { getParticipantAddresses, getParticipantContacts } from './utils';
 
 export const getSecondStepData = (formData: FormState): Partial<Participant> => {
   const {
+    beginDate,
     employment,
     organizationName,
     inn,
@@ -23,6 +25,7 @@ export const getSecondStepData = (formData: FormState): Partial<Participant> =>
   } = formData;
 
   return {
+    employmentContractDate: formatDate(beginDate || '', true),
     employmentTypeCd: employment,
     organizationName,
     organizationInn: inn,

package/src/components/CreditForm/getThirdStepData.ts

@@ -7,6 +7,7 @@ export const getThirdStepData = (formData: FormState): Partial<Participant> => {
     familyStatus,
     dependents,
     familyMembers,
+    children,
     confirmationIncome,
     wages,
     mandatoryPayments,
@@ -18,6 +19,7 @@ export const getThirdStepData = (formData: FormState): Partial<Participant> => {
     retirementIncome,
     snils,
     armyIdFlg,
+    conscription,
   } = formData;
 
   return {
@@ -25,6 +27,8 @@ export const getThirdStepData = (formData: FormState): Partial<Participant> => {
     totalDependents: familyMembers,
     incomeCertificateCd: confirmationIncome,
     otherDependents: dependents,
+    childrenDependents: children,
+    militaryStatusCd: conscription,
     participantIncomes: getParticipantIncomes({
       wages,
       mandatoryPayments,