@redneckz/wildless-cms-uni-blocks 0.14.866 → 0.14.868

package/src/components/CreditForm/CreditForm.tsx

@@ -16,14 +16,13 @@ interface CreditFormProps extends CreditFormContent, UniBlockProps {
   programsSource?: ProgramsSourceProps | JSONRefObject;
 }
 
-const STEPS = 5;
+const STEPS = 4;
 
 const STEP_TITLES = [
   '',
   'Персональные данные',
   'Данные о трудоустройстве',
   'Семейное положение и доход',
-  'Дополнительные сведения',
   'Отделение Банка',
 ];
 

package/src/components/CreditForm/creditFormStepsData.tsx

@@ -1,12 +1,200 @@
-import {
-  CALCULATOR_CONTENT,
-  COMMON_RETAIL_CONTENT,
-  DELIVERY_CREDIT_CONTENT,
-} from '../../retail/content';
+/* eslint-disable max-lines */
+import { PERSONAL_DATA } from '../../retail/content';
 import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 
+const PERSONAL_INFO_CONTENT: SectionsRetailProps[] = [
+  ...PERSONAL_DATA,
+  {
+    title: 'Адрес регистрации по месту жительства',
+    columns: 1,
+    inputs: [],
+  },
+  {
+    inputs: [
+      {
+        name: 'addressRegistration',
+        required: true,
+        dadata: true,
+        filledByEsia: true,
+      },
+      { name: 'addressMatch' },
+    ],
+  },
+  {
+    title: 'Адрес фактического проживания (место пребывания РФ)',
+    inputs: [],
+  },
+  {
+    inputs: [{ name: 'addressFact', required: true, dadata: true }],
+  },
+];
+const EMPLOYMENT_CONTENT: SectionsRetailProps[] = [
+  {
+    title: 'Данные о трудоустройстве',
+    inputs: [],
+  },
+  {
+    inputs: [
+      {
+        name: 'infoCard',
+        label:
+          'Клиент на момент оформления заявки на кредит должен быть: официально трудоустроен более 6 месяцев, ' +
+          'если Клиент получает з/п на счет РСХБ, то трудоустроен более 3 месяцев, не должен находиться в декретном отпуске',
+      },
+    ],
+  },
+  {
+    inputs: [
+      { name: 'employment', required: true },
+      { name: 'organizationName', required: true, dadata: true, filledByEsia: true },
+    ],
+  },
+  {
+    columns: 2,
+    inputs: [
+      { name: 'inn', required: true, dadata: true, filledByEsia: true },
+      { name: 'legalForm', required: true },
+    ],
+  },
+  {
+    inputs: [
+      { name: 'organization', required: true },
+      { name: 'amountWorkers', 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 },
+    ],
+  },
+  {
+    title: 'Адрес работодателя',
+    inputs: [],
+  },
+  {
+    inputs: [{ name: 'organizationAddress', required: true, dadata: true }],
+  },
+];
+const FAMILY_STATUS_AND_INCOME_CONTENT: SectionsRetailProps[] = [
+  {
+    title: 'Семейное положение',
+  },
+  {
+    columns: 1,
+    inputs: [{ name: 'familyStatus', required: true }],
+  },
+  {
+    columns: 2,
+    inputs: [
+      { name: 'children', required: true },
+      { name: 'dependents', required: true },
+    ],
+  },
+  {
+    title: 'Совокупный доход',
+  },
+  {
+    columns: 1,
+    inputs: [
+      {
+        name: 'confirmationIncome',
+        required: true,
+        filledByEsia: true,
+      },
+    ],
+  },
+  {
+    inputs: [
+      {
+        name: 'infoCard',
+        label: 'Сумма основного и дополнительных доходов после вычета налога',
+      },
+    ],
+  },
+  {
+    columns: 1,
+    inputs: [{ name: 'wages', required: true, filledByEsia: true }],
+  },
+  {
+    columns: 1,
+    inputs: [
+      {
+        name: 'retirementIncome',
+        required: true,
+        condition: { name: 'employment', values: ['RETIREE'] },
+      },
+    ],
+  },
+  {
+    columns: 1,
+    inputs: [{ name: 'mandatoryPayments', required: true }],
+  },
+  {
+    columns: 1,
+    inputs: [{ name: 'snils', required: true }],
+  },
+  {
+    columns: 1,
+    inputs: [{ name: 'initiateBankruptcyFlg' }],
+  },
+];
+
+const DELIVERY_CREDIT_CONTENT: SectionsRetailProps[] = [
+  {
+    title: 'Отделение Банка',
+    columns: 1,
+    inputs: [],
+  },
+  {
+    inputs: [{ name: 'regionRetail', required: true }],
+  },
+  {
+    inputs: [{ name: 'addressRetail', required: true }],
+  },
+  {
+    title: 'Код представителя Банка',
+    columns: 1,
+    inputs: [],
+  },
+  {
+    inputs: [
+      {
+        name: 'infoCard',
+        label: 'Если представитель Банка помогал Вам в заведении заявки, введите здесь его код',
+      },
+    ],
+  },
+  {
+    inputs: [{ name: 'bankEmployeeCode' }],
+  },
+];
+const CALCULATOR_CONTENT: SectionsRetailProps[] = [
+  {
+    columns: 1,
+    inputs: [
+      {
+        name: 'calculator',
+      },
+    ],
+  },
+];
+
 export const stepsSectionsMap: SectionsRetailProps[][] = [
   CALCULATOR_CONTENT,
-  ...COMMON_RETAIL_CONTENT,
+  PERSONAL_INFO_CONTENT,
+  EMPLOYMENT_CONTENT,
+  FAMILY_STATUS_AND_INCOME_CONTENT,
   DELIVERY_CREDIT_CONTENT,
 ];

package/src/components/CreditForm/formStateMap.tsx

@@ -1,5 +1,5 @@
 import { type LeadFormState } from '../../retail/model/LeadFormState';
-import { mainFormStateMap } from '../../retail/utils/mainFormStateMap';
+import { getMainFormStateMap } from '../../retail/utils/getMainFormStateMap';
 
 export const formStateMap: Partial<LeadFormState>[] = [
   {
@@ -15,7 +15,7 @@ export const formStateMap: Partial<LeadFormState>[] = [
       isStateEmployee: false,
     },
   },
-  ...mainFormStateMap,
+  ...getMainFormStateMap(true),
   {
     regionRetail: { key: '', text: '' },
     addressRetail: undefined,

package/src/components/CreditForm/useCreditFormAPI.tsx

@@ -19,7 +19,7 @@ export const useCreditFormAPI = ({
   onFinish,
 }: CreditFormApiProps): [LeadFormState, (formData: LeadFormState) => void, boolean] => {
   const [isSending, { setTrue: startSending, setFalse: endSending }] = useBool(false);
-  const isFinalStep = step === 5;
+  const isFinalStep = step === 4;
 
   const retailFormStore = useRetailFormStore();
 
@@ -52,7 +52,6 @@ export const useCreditFormAPI = ({
     async (formData: LeadFormState) => {
       startSending();
       retailFormStore.leadForm = formData;
-      const referalData = retailFormStore.referalData;
 
       try {
         const { taskId, profileId, participantId } = retailFormStore;
@@ -64,7 +63,6 @@ export const useCreditFormAPI = ({
               profileId,
               step,
               formData: formData as any,
-              isTaskWithReferalCode: referalData?.isTaskWithReferalCode,
             }),
           );
           resetForm(response);

package/src/components/DebitForm/DebitFormStepsData.tsx

@@ -1,12 +1,77 @@
-import {
-  DEBIT_CARD_CONTENT,
-  DEBIT_PERSONAL_INFO_CONTENT,
-  DELIVERY_DEBIT_CARD_CONTENT,
-} from '../../retail/content';
+import { DELIVERY_CARD_CONTENT, PERSONAL_DATA } from '../../retail/content';
 import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 
+const DEBIT_PERSONAL_INFO_CONTENT: SectionsRetailProps[] = [
+  ...PERSONAL_DATA,
+  {
+    title: 'Адрес регистрации по месту жительства',
+    columns: 1,
+    inputs: [],
+  },
+  {
+    inputs: [
+      {
+        name: 'addressRegistration',
+        required: true,
+        dadata: true,
+        filledByEsia: true,
+      },
+      { name: 'addressMatch' },
+    ],
+  },
+  {
+    title: 'Адрес фактического проживания (место пребывания РФ)',
+    inputs: [],
+  },
+  {
+    inputs: [{ name: 'addressFact', required: true, dadata: true }],
+  },
+];
+const DEBIT_CARD_CONTENT: SectionsRetailProps[] = [
+  {
+    title: 'Параметры карты',
+    inputs: [],
+  },
+  {
+    inputs: [
+      { name: 'currency', required: true },
+      { name: 'paymentSystem', required: true },
+      { name: 'cardCategory', required: true },
+    ],
+  },
+  {
+    title: 'Отображение на карте',
+    inputs: [],
+  },
+  {
+    columns: 2,
+    inputs: [{ name: 'latinName' }, { name: 'latinSurname', required: true }],
+  },
+  {
+    inputs: [
+      {
+        name: 'infoCard',
+        label: 'Проверьте корректность заполненных полей, при необходимости внесите изменения.',
+      },
+    ],
+  },
+  {
+    inputs: [
+      {
+        name: 'infoCard',
+        label:
+          // eslint-disable-next-line max-len
+          'Количество символов ограничивается 20. При этом, если фамилия и имя на карте содержит более 21 символа, то необходимо сократить имя и указывать на карте только первую букву имени и фамилию, если при таком сокращении фамилия и имя не умещается в количество символов – 20, то указывать только фамилию.',
+      },
+    ],
+  },
+  {
+    inputs: [{ name: 'codeWord', required: true }],
+  },
+];
+
 export const stepsSectionsMap: SectionsRetailProps[][] = [
-  DELIVERY_DEBIT_CARD_CONTENT,
+  DELIVERY_CARD_CONTENT,
   DEBIT_PERSONAL_INFO_CONTENT,
   DEBIT_CARD_CONTENT,
 ];

package/src/components/DebitForm/getDebitCardFormTaskData.ts

@@ -1,10 +1,8 @@
-import { locationNavigator } from '../../external/locationNavigator';
 import { getCardOptionsData } from '../../retail/adaptors/getCardOptionsData';
 import { getPersonalInfoData } from '../../retail/adaptors/getPersonalInfoData';
 import { type Participant } from '../../retail/api/updateUserTask';
 import { type UpdateUserTaskDebitBody } from '../../retail/api/updateUserTaskDebit';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
-import { type ReferalData } from '../../retail/model/ReferalData';
 import {
   getDebitCardData,
   getDeliveryData,
@@ -19,7 +17,6 @@ type getDebitFormTaskDataProps = {
   formData: LeadFormState;
   programId: string;
   step?: number;
-  isTaskWithReferalCode?: ReferalData['isTaskWithReferalCode'];
 };
 
 export const getDebitCardFormTaskData = ({
@@ -28,30 +25,23 @@ export const getDebitCardFormTaskData = ({
   formData,
   programId,
   step = 0,
-  isTaskWithReferalCode,
-}: getDebitFormTaskDataProps): UpdateUserTaskDebitBody => {
-  const navigator = locationNavigator();
-  const taskSource = isTaskWithReferalCode ? 'ReferalSF' : navigator.origin;
-
-  return {
-    task: {
-      taskSource,
-      id: taskId,
-      creditProgram: {
-        code: debitProgrammIdToCardCodesMap[programId],
-      },
-      ...getOfficeCode(formData),
-      participants: [
-        {
-          id: participantId,
-          ...getCurrentStepData(step, formData),
-        },
-      ],
-      ...getCardOptionsData(formData),
-      ...getDeliveryData(formData),
+}: getDebitFormTaskDataProps): UpdateUserTaskDebitBody => ({
+  task: {
+    id: taskId,
+    creditProgram: {
+      code: debitProgrammIdToCardCodesMap[programId],
     },
-  };
-};
+    ...getOfficeCode(formData),
+    participants: [
+      {
+        id: participantId,
+        ...getCurrentStepData(step, formData),
+      },
+    ],
+    ...getCardOptionsData(formData),
+    ...getDeliveryData(formData),
+  },
+});
 
 const getCurrentStepData = (step: number, formData: LeadFormState): Partial<Participant> => {
   switch (step) {

package/src/components/DebitForm/useDebitFormAPI.tsx

@@ -40,7 +40,6 @@ export const useDebitFormAPI = ({
     async (formData: LeadFormState) => {
       startSending();
       retailFormStore.leadForm = formData;
-      const referalData = retailFormStore.referalData;
 
       try {
         const { taskId, participantId, programId } = retailFormStore;
@@ -52,7 +51,6 @@ export const useDebitFormAPI = ({
               programId,
               step,
               formData: formData as any,
-              isTaskWithReferalCode: referalData?.isTaskWithReferalCode,
             }),
           );
         }

package/src/components/GalleryLayout/useSortProductBlocks.ts

@@ -2,7 +2,7 @@ import { useEffect, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
 import { type BlockDef } from '../../model/ContentPageDef';
 
-export const useSortProductBlocks = (parentBlock: BlockDef = {}): BlockDef[] => {
+export const useSortProductBlocks = (parentBlock: BlockDef): BlockDef[] => {
   const [blocks, setBlocks] = useState(parentBlock.blocks ?? []);
   const sessionStore = useSessionStore();
   const offerIds: string[] = sessionStore?.offerIds || [];
@@ -14,12 +14,17 @@ export const useSortProductBlocks = (parentBlock: BlockDef = {}): BlockDef[] =>
       .map((id) => blocksMap.get(id))
       .filter((block): block is BlockDef => Boolean(block));
 
-    const tailBlocks = blocks.filter(({ __id = '' }) => !offerIds.includes(__id));
+    const tailBlocks =
+      parentBlock.blocks?.filter(({ __id = '' }) => !offerIds.includes(__id)) ?? [];
 
     return [...blocksByOfferIds, ...tailBlocks];
-  }, [blocks, offerIds]);
+  }, [parentBlock, offerIds]);
 
-  useEffect(() => setBlocks(sortedBlocks), []);
+  useEffect(() => {
+    if (sortedBlocks.length) {
+      setBlocks(sortedBlocks);
+    }
+  }, [parentBlock]);
 
   return blocks;
 };

package/src/retail/adaptors/getCreditFormTaskData.ts

@@ -1,9 +1,6 @@
 import { getCalcData } from '../../components/CreditForm/getCalcData';
-import { locationNavigator } from '../../external/locationNavigator';
 import { type Participant, type UpdateUserTaskBody } from '../api/updateUserTask';
 import { type LeadFormState } from '../model/LeadFormState';
-import { type ReferalData } from '../model/ReferalData';
-import { getAdditionalInfoData } from './getAdditionalInfoData';
 import { getCalculatorData } from './getCalculatorData';
 import { getDeliveryCreditData } from './getDeliveryCreditData';
 import { getEmploymentData } from './getEmploymentData';
@@ -16,7 +13,6 @@ type getCreditFormTaskDataProps = {
   profileId: number;
   formData: LeadFormState;
   step?: number;
-  isTaskWithReferalCode?: ReferalData['isTaskWithReferalCode'];
 };
 
 export const getCreditFormTaskData = ({
@@ -25,40 +21,33 @@ export const getCreditFormTaskData = ({
   profileId,
   formData,
   step = 0,
-  isTaskWithReferalCode,
-}: getCreditFormTaskDataProps): UpdateUserTaskBody => {
-  const navigator = locationNavigator();
-  const taskSource = isTaskWithReferalCode ? 'ReferalSF' : navigator.origin;
-
-  return {
-    sendToBank: true,
-    taskKind: 'UNITED',
-    task: {
-      taskSource,
-      id: taskId,
-      authorizedAgentId: formData?.bankEmployeeCode,
-      participants: [
-        {
-          id: participantId,
-          profile: {
-            id: profileId,
-          },
-          roleCd: {
-            key: 'BORROWER',
-            value: 'Заемщик',
-          },
-          ...getCurrentStepData(step, formData),
+}: getCreditFormTaskDataProps): UpdateUserTaskBody => ({
+  sendToBank: true,
+  taskKind: 'UNITED',
+  task: {
+    id: taskId,
+    authorizedAgentId: formData?.bankEmployeeCode,
+    participants: [
+      {
+        id: participantId,
+        profile: {
+          id: profileId,
         },
-      ],
-      ...getCalcData(formData),
-      ...getDeliveryCreditData(formData),
-      esiaAccountTypeCd: {
-        key: formData?.esiaAccountTypeCd?.key,
-      } as UpdateUserTaskBody['task']['esiaAccountTypeCd'],
-      files: formData?.files,
-    },
-  };
-};
+        roleCd: {
+          key: 'BORROWER',
+          value: 'Заемщик',
+        },
+        ...getCurrentStepData(step, formData),
+      },
+    ],
+    ...getCalcData(formData),
+    ...getDeliveryCreditData(formData),
+    esiaAccountTypeCd: {
+      key: formData?.esiaAccountTypeCd?.key,
+    } as UpdateUserTaskBody['task']['esiaAccountTypeCd'],
+    files: formData?.files,
+  },
+});
 
 const getCurrentStepData = (step: number, formData: LeadFormState): Partial<Participant> => {
   switch (step) {
@@ -70,8 +59,6 @@ const getCurrentStepData = (step: number, formData: LeadFormState): Partial<Part
       return getEmploymentData(formData);
     case 3:
       return getFamilyStatusAndIncomeData(formData);
-    case 4:
-      return getAdditionalInfoData(formData);
     default:
       return {};
   }

package/src/retail/adaptors/getEmploymentData.tsx

@@ -30,7 +30,7 @@ export const getEmploymentData = (formData: LeadFormState): Partial<Participant>
     employmentTypeCd: employment,
     organizationName,
     organizationInn: inn,
-    organizationActivityTypeCd: employerActivities,
+    organizationActivityTypeCd: employerActivities?.key ? employerActivities : undefined,
     organizationTypeCd: organization,
     organizationKindCd: employerOrganization,
     employeesNumberCd: amountWorkers,
@@ -39,11 +39,11 @@ export const getEmploymentData = (formData: LeadFormState): Partial<Participant>
     generalSeniority: experience5Years,
     jobsNumber,
     lastWorkDuration: lastJobExperience,
-    positionCd: positionOrganization,
+    positionCd: positionOrganization?.key ? positionOrganization : undefined,
     participantContacts: getParticipantContacts({
       organizationPhone: organizationPhone && formatPhone(organizationPhone),
     }),
     participantAddresses: getParticipantAddresses({ organizationAddress }),
-    ownershipShare: positionOrganization?.key === 'BUSINESS_OWNER' ? partInBusiness : '',
+    ownershipShare: positionOrganization?.key === 'BUSINESS_OWNER' ? partInBusiness : undefined,
   };
 };

package/src/retail/adaptors/getFamilyStatusAndIncomeData.ts

@@ -19,6 +19,7 @@ export const getFamilyStatusAndIncomeData = (formData: LeadFormState): Partial<P
     snils,
     armyIdFlg,
     conscription,
+    initiateBankruptcyFlg,
   } = formData;
 
   return {
@@ -40,6 +41,7 @@ export const getFamilyStatusAndIncomeData = (formData: LeadFormState): Partial<P
     }),
     snils: snils?.replace(/[-\s]/g, ''),
     armyIdFlg,
+    initiateBankruptcyFlg,
   };
 };
 

package/src/retail/adaptors/getPersonalInfoData.tsx

@@ -20,7 +20,7 @@ export const getPersonalInfoData = (formData: LeadFormState): Partial<Participan
     dulSerie,
     dulSubdivisionCode,
     education,
-    participantDateRegistration = '',
+    participantDateRegistration,
     housing,
     addressRegistration,
     addressFact,
@@ -39,7 +39,9 @@ export const getPersonalInfoData = (formData: LeadFormState): Partial<Participan
     dulSerie,
     dulSubdivisionCode,
     educationLevelCd: education,
-    registrationDate: formatDate(participantDateRegistration, true),
+    registrationDate: participantDateRegistration
+      ? formatDate(participantDateRegistration, true)
+      : undefined,
     homeMatchFlg: addressMatch,
     houseTypeCd: housing,
     participantContacts: getParticipantContacts({

package/src/retail/api/checkCode.ts

@@ -17,7 +17,7 @@ export const checkCode = async (body: CheckCodeBody) =>
   fetchRetailJSON<CheckCodeResponse>('/sms/checkCode', 'POST', body).then(saveToken);
 
 export const saveToken = (data: CheckCodeResponse | null) => {
-  if (data) {
+  if (data?.access_token && data?.refresh_token) {
     globalThis.sessionStorage.setItem('accessToken', data.access_token);
     globalThis.sessionStorage.setItem('refreshToken', data.refresh_token);
   }

package/src/retail/api/createUserTaskDebit.ts

@@ -1,5 +1,6 @@
+import { type Nullable } from '../../utils/Nullable';
 import { fetchRetailJSON } from './doRequest';
-import { type Participant } from './updateUserTask';
+import { type MarketingInfo, type Participant } from './updateUserTask';
 
 export type CreateUserTaskDebitBody = {
   task: {
@@ -8,6 +9,7 @@ export type CreateUserTaskDebitBody = {
       code: string;
     };
     participants: Participant[];
+    marketingInfo?: Nullable<MarketingInfo>;
   };
 };
 

package/src/retail/api/updateUserTask.ts

@@ -125,13 +125,14 @@ export type MarketingInfo = {
   utm_source?: Nullable<string>;
   utm_content?: Nullable<string>;
   utm_term?: Nullable<string>;
+  bannerId?: Nullable<string>;
 };
 
 export type UpdateUserTaskBody = {
   sendToBank: boolean;
   taskKind: 'SHORT' | 'FULL' | 'UNITED';
   task: {
-    taskSource: string;
+    taskSource?: string;
     id: number;
     office?: {
       id: string;
@@ -149,7 +150,7 @@ export type UpdateUserTaskBody = {
     loanAmount?: number;
     creditPeriod?: number;
     paymentTypeCd?: PaymentType;
-    marketingInfo?: MarketingInfo;
+    marketingInfo?: Nullable<MarketingInfo>;
     files?: File[];
   };
 };

package/src/retail/api/updateUserTaskDebit.ts

@@ -4,7 +4,7 @@ import { type MarketingInfo, type Participant } from './updateUserTask';
 
 export type UpdateUserTaskDebitBody = {
   task: {
-    taskSource: string;
+    taskSource?: string;
     id: number;
     office?: {
       id: string;