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

package/mobile/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;
+    }
+  }
 };

package/mobile/src/components/ApplicationLeadForm/useApplicationLeadApi.tsx

@@ -1,6 +1,7 @@
 /* eslint-disable max-lines */
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
+import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
 import { locationNavigator } from '../../external/locationNavigator';
 import { type AspectsProps } from '../../model/AspectsProps';
 import { createDraftTask } from '../../retail/api/createDraftTask';
@@ -10,7 +11,7 @@ import { getLastTaskStatus } from '../../retail/api/getLastTaskStatus';
 import { getTaskById } from '../../retail/api/getTaskById';
 import { saveReferalInfo } from '../../retail/api/saveReferalInfo';
 import { updateUserProfile } from '../../retail/api/updateUserProfile';
-import { updateUserTask } from '../../retail/api/updateUserTask';
+import { updateUserTask, type MarketingInfo } from '../../retail/api/updateUserTask';
 import { useConsentBkiDialog } from '../../retail/components/ConsentBkiDialog/useConsentBkiDialog';
 import { useDraftDialog } from '../../retail/components/DraftDialog/useDraftDialog';
 import { VerifyPhoneDialog } from '../../retail/components/VerifyPhoneDialog/VerifyPhoneDialog';
@@ -22,7 +23,7 @@ import { formatPhone } from '../../utils/formatPhone';
 import { type ProductType } from './ApplicationLeadFormContent';
 import { productTypeToConsentsMap } from './consents';
 import { getCreditLeadFormTaskData, getDebitLeadFormTaskData } from './getLeadFormTaskData';
-import { useLeadFormStore } from './useLeadFormStore';
+import { type ApplicationLeadStore } from './useInitApplicationLead';
 import { useSaveUserData, type UserData } from './useSaveUserData';
 import { useSendLeadFormAspects } from './useSendLeadFormAspects';
 
@@ -42,7 +43,7 @@ export const useApplicationLeadApi = ({
   const [isSending, { setTrue: startSending, setFalse: endSending }] = useBool(false);
   const [ok, setOK] = useState<boolean | undefined>();
   const saveUserData = useSaveUserData();
-  const leadFormStore = useLeadFormStore();
+  const sessionStore = useSessionStore<ApplicationLeadStore>();
 
   const sendAspects = useSendLeadFormAspects({ data });
   const navigator = locationNavigator();
@@ -62,7 +63,9 @@ export const useApplicationLeadApi = ({
       const profileId = await createUserProfile({
         profile: { phone: formatPhone(transformedFormData.phone as string) },
       });
-      const referalData = leadFormStore.referalData;
+
+      const referalData = sessionStore.referalData;
+      const marketingInfo = sessionStore.marketingInfo;
 
       if (!profileId) {
         throw new Error();
@@ -75,6 +78,7 @@ export const useApplicationLeadApi = ({
           formData: transformedFormData,
           productType,
           referalData,
+          marketingInfo,
           saveUserData,
           sendAspects,
         });
@@ -138,6 +142,7 @@ const updateUserData = async ({
   formData,
   productType,
   referalData,
+  marketingInfo,
   saveUserData,
   sendAspects,
 }: {
@@ -146,20 +151,20 @@ const updateUserData = async ({
   formData: LeadFormState;
   productType: ProductType;
   referalData: ReferalData | null;
+  marketingInfo: MarketingInfo | null;
   saveUserData: (userData: UserData) => void;
   sendAspects: (profileId: number, taskId: number) => void;
 }) => {
   let taskId: number;
   let participantId: number;
   const transformedConsents = transformConsentsFields(formData, productType);
-  const isTaskWithReferalCode = referalData?.isTaskWithReferalCode;
 
   await updateUserProfile(getUpdateUserProfileData(profileId, formData, transformedConsents));
 
   try {
     if (productType === 'debitCard') {
       const debitData = await createUserTaskDebit(
-        getDebitLeadFormTaskData(formData, programId, isTaskWithReferalCode),
+        getDebitLeadFormTaskData(formData, programId, marketingInfo),
       );
 
       taskId = debitData.taskId;
@@ -178,11 +183,11 @@ const updateUserData = async ({
           taskId,
           profileId,
           formData,
-          isTaskWithReferalCode,
+          marketingInfo,
         }),
       );
     }
-    if (isTaskWithReferalCode) {
+    if (referalData?.referalCode) {
       await saveReferalInfo({
         taskId,
         ...referalData,
@@ -207,7 +212,6 @@ const transformConsentsFields = (
     consentInformFlg,
     consentProviderFlg,
     consentInformMaterialsFlg,
-    consentPhotoFlg,
     consentFATCA,
   } = formData;
 
@@ -215,14 +219,14 @@ const transformConsentsFields = (
 
   if (productType === 'credit') {
     consents = {
-      consentPhotoFlg: consentOthersFlg,
       consentPfrFlg: consentPfrFlg,
       consentInformMaterialsFlg: consentOthersFlg,
+      consentPhotoFlg: false,
     };
   } else if (productType === 'creditCard') {
     consents = {
       consentInformMaterialsFlg,
-      consentPhotoFlg,
+      consentPhotoFlg: false,
     };
   } else {
     consents = {

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

@@ -1,7 +1,10 @@
+/* eslint-disable camelcase */
 /* eslint-disable max-lines-per-function */
 import { useCallback, useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
+import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
 import { useSetter } from '../../hooks/useSetter';
 import { esiaRequestProfile } from '../../retail/api/esiaRequestProfile';
+import { type MarketingInfo } from '../../retail/api/updateUserTask';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
 import { type ReferalData } from '../../retail/model/ReferalData';
 import { type FieldRetailDef } from '../../retail/model/RetailFormContent';
@@ -19,6 +22,11 @@ type InitApplicationLeadProps = {
   esiaAuthSuccess: boolean;
 };
 
+export interface ApplicationLeadStore {
+  marketingInfo: MarketingInfo | null;
+  referalData: ReferalData | null;
+}
+
 export const useInitApplicationLead = ({
   inputs,
   productType,
@@ -27,6 +35,7 @@ export const useInitApplicationLead = ({
 }: InitApplicationLeadProps): LeadFormState => {
   const leadFormStore = useLeadFormStore();
   const saveForm = useSetter(leadFormStore, 'leadForm');
+  const sessionStore = useSessionStore<ApplicationLeadStore>();
   const queryFromStorage = globalThis.sessionStorage?.getItem(QUERY_STORAGE_KEY);
 
   const initialFormState = useMemo(
@@ -61,27 +70,21 @@ export const useInitApplicationLead = ({
   useEffect(() => {
     leadFormStore.productType = productType;
 
-    const { code, state, referalCode, refererCode, productId } = getLeadQueryParams(
-      leadFormStore.referalData,
+    const { code, state, referalCode, refererCode, productId, marketingInfo } = getLeadQueryParams(
       queryFromStorage,
+      sessionStore,
     );
 
     if (referalCode) {
-      leadFormStore.referalData = {
+      sessionStore.referalData = {
         refererCode,
         referalCode,
         productId,
-        isTaskWithReferalCode: true,
-      };
-    } else if (!code) {
-      leadFormStore.referalData = {
-        refererCode: null,
-        referalCode: null,
-        productId: null,
-        isTaskWithReferalCode: false,
       };
     }
 
+    sessionStore.marketingInfo = marketingInfo;
+
     if (code && state) {
       requestEsiaProfile(code, state);
     } else {
@@ -93,7 +96,12 @@ export const useInitApplicationLead = ({
   return initialFormState;
 };
 
-const getLeadQueryParams = (referalData: ReferalData | null, queryFromStorage: string | null) => {
+const getLeadQueryParams = (
+  queryFromStorage: string | null,
+  sessionStore: ApplicationLeadStore,
+) => {
+  const referalData = sessionStore.referalData;
+  const marketingInfoFromStorage = sessionStore.marketingInfo;
   const queryStorage = new URLSearchParams(decodeURIComponent(queryFromStorage || ''));
 
   const code = queryStorage.get('code');
@@ -101,6 +109,16 @@ const getLeadQueryParams = (referalData: ReferalData | null, queryFromStorage: s
   const referalCode = code ? referalData?.referalCode : queryStorage.get('referalCode');
   const refererCode = code ? referalData?.refererCode : queryStorage.get('refererCode');
   const productId = code ? referalData?.productId : queryStorage.get('productId');
+  const marketingInfo = code
+    ? marketingInfoFromStorage
+    : {
+        utm_campaign: queryStorage.get('utm_campaign'),
+        utm_medium: queryStorage.get('utm_medium'),
+        utm_source: queryStorage.get('utm_source'),
+        utm_content: queryStorage.get('utm_content'),
+        utm_term: queryStorage.get('utm_term'),
+        bannerId: queryStorage.get('bannerId'),
+      };
 
   return {
     code,
@@ -108,5 +126,6 @@ const getLeadQueryParams = (referalData: ReferalData | null, queryFromStorage: s
     referalCode,
     refererCode,
     productId,
+    marketingInfo,
   };
 };

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

@@ -1,12 +1,252 @@
-import {
-  COMMON_RETAIL_CONTENT,
-  CREDIT_CARD_CONTENT,
-  DELIVERY_CREDIT_CARD_CONTENT,
-} from '../../retail/content';
+/* eslint-disable max-lines */
+import { DELIVERY_CARD_CONTENT, PERSONAL_DATA } from '../../retail/content';
 import { type CreditCardSectionsProps } from './CreditCardFormContent';
 
+const PERSONAL_INFO_CONTENT: CreditCardSectionsProps[] = [
+  ...PERSONAL_DATA,
+  {
+    inputs: [
+      {
+        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' }],
+  },
+];
+const CREDIT_CARD_CONTENT: CreditCardSectionsProps[] = [
+  {
+    title: 'Параметры карты',
+    inputs: [],
+  },
+  {
+    inputs: [
+      { name: 'currency', required: true },
+      { name: 'paymentSystem', required: true },
+      { name: 'cardCategory', required: true },
+      { name: 'codeWord', required: true },
+    ],
+  },
+];
+const DELIVERY_CREDIT_CARD_CONTENT: CreditCardSectionsProps[] = [
+  ...DELIVERY_CARD_CONTENT,
+  {
+    inputs: [
+      {
+        name: 'infoCard',
+        label: 'Если представитель Банка помогал Вам в заведении заявки, введите здесь его код',
+        condition: {
+          name: 'methodObtain',
+          values: ['office'],
+        },
+      },
+      {
+        name: 'bankEmployeeCode',
+        condition: {
+          name: 'methodObtain',
+          values: ['office'],
+        },
+      },
+    ],
+  },
+];
+
 export const stepsSectionsMap: CreditCardSectionsProps[][] = [
   CREDIT_CARD_CONTENT,
-  ...COMMON_RETAIL_CONTENT,
+  PERSONAL_INFO_CONTENT,
+  EMPLOYMENT_CONTENT,
+  FAMILY_STATUS_AND_INCOME_CONTENT,
+  ADDITIONAL_CONTENT,
   DELIVERY_CREDIT_CARD_CONTENT,
 ];

package/mobile/src/components/CreditCardForm/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>[] = [
   {
@@ -7,7 +7,7 @@ export const formStateMap: Partial<LeadFormState>[] = [
     currency: '810',
     codeWord: '',
   },
-  ...mainFormStateMap,
+  ...getMainFormStateMap(),
   {
     regionRetail: { key: '', text: '' },
     addressRetail: { key: '', text: '' },

package/mobile/src/components/CreditCardForm/getCreditCardFormTaskData.ts

@@ -1,4 +1,3 @@
-import { locationNavigator } from '../../external/locationNavigator';
 import { getAdditionalInfoData } from '../../retail/adaptors/getAdditionalInfoData';
 import { getCardOptionsData } from '../../retail/adaptors/getCardOptionsData';
 import { getEmploymentData } from '../../retail/adaptors/getEmploymentData';
@@ -6,7 +5,6 @@ import { getFamilyStatusAndIncomeData } from '../../retail/adaptors/getFamilySta
 import { getPersonalInfoData } from '../../retail/adaptors/getPersonalInfoData';
 import { type Participant, type UpdateUserTaskBody } from '../../retail/api/updateUserTask';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
-import { type ReferalData } from '../../retail/model/ReferalData';
 import {
   getDeliveryCreditCardData,
   getDeliveryData,
@@ -19,7 +17,6 @@ type getCreditCardFormTaskDataProps = {
   profileId: number;
   formData: LeadFormState;
   step?: number;
-  isTaskWithReferalCode?: ReferalData['isTaskWithReferalCode'];
 };
 
 export const getCreditCardFormTaskData = ({
@@ -28,38 +25,31 @@ export const getCreditCardFormTaskData = ({
   profileId,
   formData,
   step = 0,
-  isTaskWithReferalCode,
-}: getCreditCardFormTaskDataProps): UpdateUserTaskBody => {
-  const navigator = locationNavigator();
-  const taskSource = isTaskWithReferalCode ? 'ReferalSF' : navigator.origin;
-
-  return {
-    sendToBank: true,
-    taskKind: 'UNITED',
-    task: {
-      taskSource,
-      id: taskId,
-      ...getOfficeCode(formData),
-      authorizedAgentId: formData?.bankEmployeeCode,
-      participants: [
-        {
-          id: participantId,
-          profile: {
-            id: profileId,
-          },
-          roleCd: {
-            key: 'BORROWER',
-            value: 'Заемщик',
-          },
-          ...getCurrentStepData(step, formData),
+}: getCreditCardFormTaskDataProps): UpdateUserTaskBody => ({
+  sendToBank: true,
+  taskKind: 'UNITED',
+  task: {
+    id: taskId,
+    ...getOfficeCode(formData),
+    authorizedAgentId: formData?.bankEmployeeCode,
+    participants: [
+      {
+        id: participantId,
+        profile: {
+          id: profileId,
         },
-      ],
-      ...getCardOptionsData(formData),
-      ...getDeliveryData(formData),
-      files: formData?.files,
-    },
-  };
-};
+        roleCd: {
+          key: 'BORROWER',
+          value: 'Заемщик',
+        },
+        ...getCurrentStepData(step, formData),
+      },
+    ],
+    ...getCardOptionsData(formData),
+    ...getDeliveryData(formData),
+    files: formData?.files,
+  },
+});
 
 const getCurrentStepData = (step: number, formData: LeadFormState): Partial<Participant> => {
   switch (step) {

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

@@ -48,7 +48,6 @@ export const useCreditCardFormAPI = ({
     async (formData: LeadFormState) => {
       startSending();
       retailFormStore.leadForm = formData;
-      const referalData = retailFormStore.referalData;
 
       try {
         const { taskId, profileId, participantId } = retailFormStore;
@@ -60,7 +59,6 @@ export const useCreditCardFormAPI = ({
               profileId,
               step,
               formData: formData as any,
-              isTaskWithReferalCode: referalData?.isTaskWithReferalCode,
             }),
           );
           resetForm(response);