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

package/mobile/src/retail/components/DraftDialog/parseDraftTask.ts

@@ -11,14 +11,13 @@ import {
   INCOME_CERTIFICATE,
 } from './utils';
 
-export const parseDraftTask = (task: Task): [LeadFormState, boolean] => {
+export const parseDraftTask = (task: Task): LeadFormState => {
   const participant = task.participants[0];
   const {
     classCard: cardCategory,
     codeWord,
     paymentSystemTypeCd: paymentSystem,
     currencyCode: currency,
-    taskSource,
   } = task;
 
   const { loanAmount: moneyValue, creditPeriod: monthsValue, paymentTypeCd } = task;
@@ -72,7 +71,7 @@ export const parseDraftTask = (task: Task): [LeadFormState, boolean] => {
     profile,
   } = participant;
 
-  const taskFromDraft = {
+  return {
     currency: currency?.key,
     paymentSystem: getSelectValue(paymentSystem),
     cardCategory: getSelectValue(cardCategory),
@@ -129,6 +128,4 @@ export const parseDraftTask = (task: Task): [LeadFormState, boolean] => {
     ...getParticipantContacts(participantContacts),
     ...getParticipantGender(genderCd),
   };
-
-  return [taskFromDraft, taskSource === 'ReferalSF'];
 };

package/mobile/src/retail/components/Fields/DaDataInnField.tsx

@@ -3,7 +3,7 @@ import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
 import { getOrganizationFromInn } from '../../api/getOrganizationFromInn';
-import { useRetailFormStore } from '../../hooks/useRetailFormStore';
+import { useRetailFormStore, type CreditFormStoreSlice } from '../../hooks/useRetailFormStore';
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { updateOrganizationFields } from '../../utils/updateOrganizationFields';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
@@ -19,11 +19,7 @@ export const DaDataInnField = JSX<CustomFieldProps>(({ field, input }) => {
   }, []);
 
   useEffect(() => {
-    if (
-      !esiaAccountTypeCd ||
-      !inn ||
-      !(employerActivities && employerOrganization && organization && amountWorkers)
-    ) {
+    if (!esiaAccountTypeCd || !inn || !isDictionariesAlreadyLoad(store as CreditFormStoreSlice)) {
       return;
     }
     (async () => {
@@ -46,3 +42,15 @@ export const DaDataInnField = JSX<CustomFieldProps>(({ field, input }) => {
     />
   );
 });
+
+const isDictionariesAlreadyLoad = (store: CreditFormStoreSlice) => {
+  const { employerActivities, employerOrganization, organization, amountWorkers, productType } =
+    store;
+
+  return [
+    employerOrganization,
+    organization,
+    amountWorkers,
+    productType === 'creditCard' ? employerActivities : true,
+  ].every(Boolean);
+};

package/mobile/src/retail/components/Fields/InitiateBankruptcyFlgField.tsx

@@ -0,0 +1,10 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { CheckboxWithError } from '../../../ui-kit/Checkbox/CheckboxWithError';
+import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+
+export const InitiateBankruptcyFlgField = JSX<CustomFieldProps>(({ field, input }) => (
+  <CheckboxWithError
+    text="Я планирую в ближайшее время инициировать дело о банкротстве в отношении себя"
+    {...field(input?.name ?? '')}
+  />
+));

package/mobile/src/retail/content.tsx

@@ -1,8 +1,7 @@
 /* eslint-disable max-lines */
-
 import { type CreditCardSectionsProps } from '../components/CreditCardForm/CreditCardFormContent';
 
-const PERSONAL_DATA: CreditCardSectionsProps[] = [
+export const PERSONAL_DATA: CreditCardSectionsProps[] = [
   {
     title: 'Персональные данные',
     columns: 2,
@@ -37,10 +36,6 @@ const PERSONAL_DATA: CreditCardSectionsProps[] = [
       },
     ],
   },
-];
-
-const PERSONAL_INFO_CONTENT: CreditCardSectionsProps[] = [
-  ...PERSONAL_DATA,
   {
     inputs: [
       {
@@ -49,265 +44,11 @@ const PERSONAL_INFO_CONTENT: CreditCardSectionsProps[] = [
         dadata: true,
         filledByEsia: true,
       },
-      {
-        name: 'education',
-        required: true,
-      },
-    ],
-  },
-  {
-    title: 'Адрес регистрации по месту жительства',
-    columns: 1,
-    inputs: [],
-  },
-  {
-    inputs: [
-      {
-        name: 'addressRegistration',
-        required: true,
-        dadata: true,
-        filledByEsia: true,
-      },
-      { name: 'addressMatch' },
-    ],
-  },
-  {
-    columns: 2,
-    inputs: [{ name: 'participantDateRegistration', required: true }],
-  },
-  {
-    title: 'Адрес фактического проживания (место пребывания РФ)',
-    inputs: [],
-  },
-  {
-    columns: 2,
-    inputs: [{ name: 'housing', required: true }],
-  },
-  {
-    inputs: [{ name: 'addressFact', required: true, dadata: true }],
-  },
-];
-const EMPLOYMENT_CONTENT: CreditCardSectionsProps[] = [
-  {
-    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: '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 },
-      { name: 'jobsNumber', required: true, filledByEsia: true },
-    ],
-  },
-  {
-    inputs: [
-      {
-        name: 'organizationPhone',
-        label: 'Телефон работодателя',
-        required: true,
-      },
-      { name: 'beginDate', required: true, filledByEsia: true },
-    ],
-  },
-  {
-    columns: 2,
-    inputs: [
-      { name: 'positionOrganization', required: true },
-      {
-        name: 'partInBusiness',
-        required: true,
-        condition: { name: 'positionOrganization', values: ['BUSINESS_OWNER'] },
-      },
-    ],
-  },
-  {
-    title: 'Адрес работодателя',
-    inputs: [],
-  },
-  {
-    inputs: [{ name: 'organizationAddress', required: true, dadata: true }],
-  },
-];
-const FAMILY_STATUS_AND_INCOME_CONTENT: CreditCardSectionsProps[] = [
-  {
-    title: 'Семейное положение',
-  },
-  {
-    columns: 1,
-    inputs: [{ name: 'familyStatus', required: true }],
-  },
-  {
-    columns: 1,
-    inputs: [{ name: 'children', required: true }],
-  },
-  {
-    columns: 2,
-    inputs: [{ name: 'dependents', required: true }, { name: 'familyMembers' }],
-  },
-  {
-    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: 'conscription', required: true }],
-  },
-  {
-    columns: 2,
-    inputs: [{ name: 'armyIdFlg' }],
-  },
-];
-const ADDITIONAL_CONTENT: CreditCardSectionsProps[] = [
-  {
-    title: 'Дополнительные сведения',
-    columns: 1,
-    inputs: [],
-  },
-  {
-    inputs: [{ name: 'bankruptcyFlg' }],
-  },
-  {
-    inputs: [{ name: 'shareholderFlg' }],
-  },
-  {
-    inputs: [{ name: 'legalEntityName' }],
-  },
-  {
-    inputs: [{ name: 'creditInRshbCd' }],
-  },
-];
-export const COMMON_RETAIL_CONTENT: CreditCardSectionsProps[][] = [
-  PERSONAL_INFO_CONTENT,
-  EMPLOYMENT_CONTENT,
-  FAMILY_STATUS_AND_INCOME_CONTENT,
-  ADDITIONAL_CONTENT,
-];
-export const DELIVERY_CREDIT_CONTENT: CreditCardSectionsProps[] = [
-  {
-    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' }],
-  },
-];
-export const CREDIT_CARD_CONTENT: CreditCardSectionsProps[] = [
-  {
-    title: 'Параметры карты',
-    inputs: [],
-  },
-  {
-    inputs: [
-      { name: 'currency', required: true },
-      { name: 'paymentSystem', required: true },
-      { name: 'cardCategory', required: true },
-      { name: 'codeWord', required: true },
-    ],
-  },
-];
-export const CALCULATOR_CONTENT: CreditCardSectionsProps[] = [
-  {
-    columns: 1,
-    inputs: [
-      {
-        name: 'calculator',
-      },
     ],
   },
 ];
-export const DELIVERY_DEBIT_CARD_CONTENT: CreditCardSectionsProps[] = [
+
+export const DELIVERY_CARD_CONTENT: CreditCardSectionsProps[] = [
   {
     title: 'Регион обслуживания карты',
     columns: 1,
@@ -416,103 +157,3 @@ export const DELIVERY_DEBIT_CARD_CONTENT: CreditCardSectionsProps[] = [
     ],
   },
 ];
-export const DEBIT_PERSONAL_INFO_CONTENT: CreditCardSectionsProps[] = [
-  ...PERSONAL_DATA,
-  {
-    inputs: [
-      {
-        name: 'dulIssuedBy',
-        required: true,
-        dadata: true,
-        filledByEsia: true,
-      },
-    ],
-  },
-  {
-    title: 'Адрес регистрации по месту жительства',
-    columns: 1,
-    inputs: [],
-  },
-  {
-    inputs: [
-      {
-        name: 'addressRegistration',
-        required: true,
-        dadata: true,
-        filledByEsia: true,
-      },
-      { name: 'addressMatch' },
-    ],
-  },
-  {
-    title: 'Адрес фактического проживания (место пребывания РФ)',
-    inputs: [],
-  },
-  {
-    inputs: [{ name: 'addressFact', required: true, dadata: true }],
-  },
-];
-export const DEBIT_CARD_CONTENT: CreditCardSectionsProps[] = [
-  {
-    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 DELIVERY_CREDIT_CARD_CONTENT: CreditCardSectionsProps[] = [
-  ...DELIVERY_DEBIT_CARD_CONTENT,
-  {
-    inputs: [
-      {
-        name: 'infoCard',
-        label: 'Если представитель Банка помогал Вам в заведении заявки, введите здесь его код',
-        condition: {
-          name: 'methodObtain',
-          values: ['office'],
-        },
-      },
-      {
-        name: 'bankEmployeeCode',
-        condition: {
-          name: 'methodObtain',
-          values: ['office'],
-        },
-      },
-    ],
-  },
-];

package/mobile/src/retail/inputs.tsx

@@ -42,6 +42,7 @@ import { FamilyStatusField } from './components/Fields/FamilyStatusField';
 import { GeneralSeniorityField } from './components/Fields/GeneralSeniorityField';
 import { HousingField } from './components/Fields/HousingField';
 import { InfoCardField } from './components/Fields/InfoCardField';
+import { InitiateBankruptcyFlgField } from './components/Fields/InitiateBankruptcyFlgField';
 import { JobsNumberField } from './components/Fields/JobsNumberField';
 import { LastJobExperienceField } from './components/Fields/LastJobExperienceField';
 import { LatinNameField } from './components/Fields/LatinNameField';
@@ -88,7 +89,6 @@ export const InputsConsentsMap = {
   consentInformFlg: ConsentField,
   consentPfrFlg: ConsentField,
   consentInformMaterialsFlg: ConsentField,
-  consentPhotoFlg: ConsentField,
   consentFATCA: ConsentField,
 };
 
@@ -136,6 +136,7 @@ export const InputsRetailMap = {
   wages: WagesField,
   mandatoryPayments: MandatoryPaymentsField,
   bankruptcyFlg: BankruptcyFlgField,
+  initiateBankruptcyFlg: InitiateBankruptcyFlgField,
   shareholderFlg: ShareholderFlgField,
   legalEntityName: LegalEntityNameField,
   creditInRshbCd: CreditInRshbCdField,

package/mobile/src/retail/model/LeadFormState.ts

@@ -16,7 +16,6 @@ export interface CreditCardFormConsents {
   consentOthersFlg?: boolean;
   consentInformFlg?: boolean;
   consentInformMaterialsFlg?: boolean;
-  consentPhotoFlg?: boolean;
 }
 
 export interface DebitCardFormConsents {
@@ -84,7 +83,9 @@ export type File = {
 
 export type FormRetailConsents = CreditFormConsents &
   CreditCardFormConsents &
-  DebitCardFormConsents;
+  DebitCardFormConsents & {
+    consentPhotoFlg?: boolean;
+  };
 
 // TODO Какая то часть должна быть взята из RetailAPI
 export interface LeadFormState extends FormRetailConsents, FormStateDeliveryType {
@@ -169,6 +170,7 @@ export interface LeadFormState extends FormRetailConsents, FormStateDeliveryType
   wages?: string;
   creditInRshbCd?: Option;
   bankruptcyFlg?: boolean;
+  initiateBankruptcyFlg?: boolean;
   shareholderFlg?: boolean;
   legalEntityName?: string;
   partInBusiness?: string;

package/mobile/src/retail/model/NameFieldDef.ts

@@ -77,6 +77,7 @@ type NameFieldRetailDef =
   | 'wages'
   | 'mandatoryPayments'
   | 'bankruptcyFlg'
+  | 'initiateBankruptcyFlg'
   | 'shareholderFlg'
   | 'legalEntityName'
   | 'creditInRshbCd'

package/mobile/src/retail/model/ReferalData.ts

@@ -4,5 +4,4 @@ export type ReferalData = {
   refererCode?: Nullable<string>;
   referalCode?: Nullable<string>;
   productId?: Nullable<string>;
-  isTaskWithReferalCode?: boolean;
 };

package/mobile/src/retail/utils/{mainFormStateMap.ts → getMainFormStateMap.ts}

@@ -1,6 +1,6 @@
 import { type LeadFormState } from '../model/LeadFormState';
 
-export const mainFormStateMap: Partial<LeadFormState>[] = [
+export const getMainFormStateMap = (isCredit = false): Partial<LeadFormState>[] => [
   {
     surname: '',
     name: '',
@@ -55,8 +55,9 @@ export const mainFormStateMap: Partial<LeadFormState>[] = [
     wages: undefined,
     mandatoryPayments: undefined,
     snils: '',
-    armyIdFlg: false,
+    armyIdFlg: isCredit ? undefined : false,
     esiaAccountTypeCd: { key: '', text: '' },
+    initiateBankruptcyFlg: isCredit ? false : undefined,
   },
   {
     bankruptcyFlg: false,

package/package.json

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

package/src/components/ApplicationLeadForm/applicationFormData.tsx

@@ -12,7 +12,6 @@ export const getApplicationFormData = (productType: ProductType): SectionsRetail
     { name: 'consentInformFlg' },
     { name: 'consentPfrFlg' },
     { name: 'consentInformMaterialsFlg' },
-    { name: 'consentPhotoFlg' },
     { name: 'consentFATCA', required: true },
   ];
 

package/src/components/ApplicationLeadForm/consents.ts

@@ -53,10 +53,6 @@ const CREDIT_CARD_CONSENTS: Record<keyof CreditCardFormConsents, ConsentData> =
     text: 'Согласие на получение информационных материалов',
     docId: 18,
   },
-  consentPhotoFlg: {
-    text: 'Согласие на фотографирование',
-    docId: 17,
-  },
 };
 
 const DEBIT_CARD_CONSENTS: Record<keyof DebitCardFormConsents, ConsentData> = {

package/src/components/ApplicationLeadForm/getLeadFormTaskData.ts

@@ -1,12 +1,11 @@
 /* eslint-disable camelcase */
-import { locationNavigator } from '../../external/locationNavigator';
 import { getParticipantContacts } from '../../retail/adaptors/utils';
 import { type CreateUserTaskDebitBody } from '../../retail/api/createUserTaskDebit';
 import { type MarketingInfo, type UpdateUserTaskBody } from '../../retail/api/updateUserTask';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
-import { type ReferalData } from '../../retail/model/ReferalData';
 import { formatDate } from '../../utils/formatDate';
 import { formatPhone } from '../../utils/formatPhone';
+import { type Nullable } from '../../utils/Nullable';
 import { debitProgrammIdToCardCodesMap } from '../DebitForm/utils';
 
 type getLeadFormTaskDataProps = {
@@ -14,7 +13,7 @@ type getLeadFormTaskDataProps = {
   taskId: number;
   profileId: number;
   formData: LeadFormState;
-  isTaskWithReferalCode?: ReferalData['isTaskWithReferalCode'];
+  marketingInfo: MarketingInfo | null;
 };
 
 export const getCreditLeadFormTaskData = ({
@@ -22,11 +21,10 @@ export const getCreditLeadFormTaskData = ({
   taskId,
   profileId,
   formData,
-  isTaskWithReferalCode,
+  marketingInfo,
 }: getLeadFormTaskDataProps): UpdateUserTaskBody => {
   const { name, surname, middleName, limitedBirthday, phone, email } = formData;
-  const navigator = locationNavigator();
-  const taskSource = isTaskWithReferalCode ? 'ReferalSF' : navigator.origin;
+  const taskSource = getTaskSource(marketingInfo?.utm_source);
 
   return {
     sendToBank: true,
@@ -54,7 +52,7 @@ export const getCreditLeadFormTaskData = ({
           },
         },
       ],
-      marketingInfo: getMarketingInfo(),
+      marketingInfo,
     },
   };
 };
@@ -62,11 +60,10 @@ export const getCreditLeadFormTaskData = ({
 export const getDebitLeadFormTaskData = (
   formData: LeadFormState,
   programId: string,
-  isTaskWithReferalCode: ReferalData['isTaskWithReferalCode'],
+  marketingInfo: MarketingInfo | null,
 ): CreateUserTaskDebitBody => {
   const { name, surname, middleName, limitedBirthday, phone, email } = formData;
-  const navigator = locationNavigator();
-  const taskSource = isTaskWithReferalCode ? 'ReferalSF' : navigator.origin;
+  const taskSource = getTaskSource(marketingInfo?.utm_source);
 
   return {
     task: {
@@ -86,18 +83,23 @@ export const getDebitLeadFormTaskData = (
           }),
         },
       ],
+      marketingInfo: {
+        bannerId: marketingInfo?.bannerId,
+      },
     },
   };
 };
 
-const getMarketingInfo = (): MarketingInfo => {
-  const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
-
-  return {
-    utm_campaign: params.get('utm_campaign'),
-    utm_medium: params.get('utm_medium'),
-    utm_source: params.get('utm_source'),
-    utm_content: params.get('utm_content'),
-    utm_term: params.get('utm_term'),
-  };
+const getTaskSource = (source: Nullable<string>) => {
+  switch (source) {
+    case 'referal_sf': {
+      return 'ReferalSF';
+    }
+    case 'vse_svoe': {
+      return 'vseSvoe';
+    }
+    default: {
+      return globalThis.location.origin;
+    }
+  }
 };