@redneckz/wildless-cms-uni-blocks 0.14.980 → 0.14.982

package/src/components/ApplicationLeadForm/parseEsiaProfile.ts

@@ -12,8 +12,15 @@ export const parseEsiaProfile = async (
   checkEsiaData(esiaProfile);
   const isFullEsiaData = !isDebit && checkEsiaAdditionalDocument(esiaProfile, isNewMicroservice);
 
-  const { profile, addInfo, document, addressRegistration, addressFact, esiaAdditionalDocument } =
-    esiaProfile;
+  const {
+    profile,
+    addInfo,
+    document,
+    addressRegistration,
+    addressFact,
+    esiaAdditionalDocument,
+    crshbFileIds,
+  } = esiaProfile;
   let files: File[] = [];
 
   if (isFullEsiaData && !isNewMicroservice) {
@@ -55,6 +62,7 @@ export const parseEsiaProfile = async (
       confirmationIncome: { key: 'SFR_CERTIFICATE', text: 'Запрос Банком доходов из СФР' },
       employment: { key: 'WORK', text: 'Работаю' },
       files,
+      crshbFileIds,
     }),
   };
 };
@@ -85,20 +93,22 @@ const buildAddress = (fields: EsiaRequestProfileResponse['addressRegistration'])
 
   const place = locality || city;
 
+  const getAddressItem = (item: string, name: string) => (item ? `${name} ${item}` : undefined);
+
   const fullAddress = concatFullAddress([
     postcode,
     region,
     place,
-    street ? `ул ${street}` : undefined,
-    house ? `д ${house}` : undefined,
-    block ? `к ${block}` : undefined,
-    building ? `стр ${building}` : undefined,
-    apartment ? `кв ${apartment}` : undefined,
+    getAddressItem(street, 'ул'),
+    getAddressItem(house, 'д'),
+    getAddressItem(block, 'к'),
+    getAddressItem(building, 'стр'),
+    getAddressItem(apartment, 'кв'),
   ]);
 
   return {
     ...fields,
-    regionCode: regionCode?.key,
+    regionCode: regionCode?.key ?? regionCode,
     fullAddress,
   };
 };
@@ -181,7 +191,7 @@ const checkEsiaAdditionalDocument = (
   esiaProfile: EsiaRequestProfileResponse,
   isNewMicroservice: boolean,
 ) => {
-  const { esiaAdditionalDocument } = esiaProfile;
+  const { esiaAdditionalDocument, crshbFileIds } = esiaProfile;
   const documents = [
     esiaAdditionalDocument?.pdfFilePayout,
     esiaAdditionalDocument?.pdfFileWorkbook,
@@ -191,6 +201,10 @@ const checkEsiaAdditionalDocument = (
     esiaAdditionalDocument?.xmlFileWorkbook,
   ];
 
+  const isDocumentsValid = isNewMicroservice
+    ? Boolean(crshbFileIds?.length)
+    : documents.every(Boolean);
+
   const data = [
     esiaAdditionalDocument?.inn,
     esiaAdditionalDocument?.averageMonthlyIncome?.toString(),
@@ -201,5 +215,5 @@ const checkEsiaAdditionalDocument = (
     esiaAdditionalDocument?.jobsNumberInFiveYears?.toString(),
   ];
 
-  return data.every(Boolean) && (isNewMicroservice || documents.every(Boolean));
+  return data.every(Boolean) && isDocumentsValid;
 };

package/src/retail/api/createUserTaskDebit.ts

@@ -10,8 +10,8 @@ export type CreateUserTaskDebitBody = {
     };
     participants: Participant[];
     marketingInfo?: Nullable<MarketingInfo>;
-    claimChannelCode?: string;
   };
+  claimChannelCode?: string;
 };
 
 export type CreateUserTaskDebitResponse = {

package/src/retail/api/esiaRequestProfile.ts

@@ -86,6 +86,7 @@ export type EsiaRequestProfileResponse = CheckCodeResponse & {
     xmlFileSigWorkbook: string;
     xmlFileWorkbook: string;
   };
+  crshbFileIds?: number[];
 };
 
 export const esiaRequestProfile = async (body: EsiaRequestProfileBody) => {

package/src/retail/api/updateUserTask.ts

@@ -166,6 +166,7 @@ export type UpdateUserTaskBody = {
     marketingInfo?: Nullable<MarketingInfo>;
     files?: File[];
   };
+  crshbFileIds?: number[];
 };
 
 export const updateUserTask = (body: UpdateUserTaskBody) =>

package/src/retail/model/LeadFormState.ts

@@ -189,4 +189,5 @@ export interface LeadFormState extends FormRetailConsents, FormStateDeliveryType
   isMomentDebitCard?: boolean;
   files?: File[];
   deliveryTime?: string;
+  crshbFileIds?: number[];
 }