@redneckz/wildless-cms-uni-blocks 0.14.711 → 0.14.713

package/mobile/src/api/RetailAPI/getPaymentSystems.ts

@@ -1,5 +1,10 @@
+import { type Option } from '../../ui-kit/Select/Option';
 import { fetchRetailJSON } from './doRequest';
-import { type PaymentSystem } from './updateUserTask';
+
+type PaymentSystem = {
+  name: string;
+  type: string;
+};
 
 type PaymentSystemResponse = {
   paymentSystems?: PaymentSystem[];
@@ -14,5 +19,11 @@ export const getPaymentSystems = async (creditProgramId: string) => {
     },
   );
 
-  return data?.paymentSystems || [];
+  return formatData(data?.paymentSystems || []);
 };
+
+const formatData = (paymentSystems: PaymentSystem[]): Option[] =>
+  paymentSystems.map((_) => ({
+    key: _.type,
+    text: _.name,
+  }));

package/mobile/src/api/RetailAPI/getTaskStatus.ts

@@ -4,6 +4,11 @@ export enum STATUS_TYPE {
   process = 'IN_PROCESS',
   ok = 'APPROVED',
   fail = 'CANCELLED',
+  pre_decision = 'PRE_DECISION',
+  approved = 'APPROVED',
+  cancelled = 'CANCELLED',
+  failed = 'FAILED',
+  draft = 'DRAFT',
   rework = 'REVISION',
 }
 

package/mobile/src/api/RetailAPI/updateUserTask.ts

@@ -41,11 +41,6 @@ export type PaymentType = {
   value: string;
 };
 
-export type PaymentSystem = {
-  name: string;
-  type: string;
-};
-
 export type Participant = {
   birthDate?: string;
   id: number;
@@ -110,7 +105,7 @@ export type Participant = {
     value: string;
   };
   currencyCode?: { key: string };
-  paymentSystemTypeCd?: PaymentSystem;
+  paymentSystemTypeCd?: Option;
   classCard?: Option;
   codeWord?: string;
 };

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

@@ -1,4 +1,4 @@
-import { type PaymentSystem, type PaymentType } from '../../api/RetailAPI/updateUserTask';
+import { type PaymentType } from '../../api/RetailAPI/updateUserTask';
 import { type Option } from '../../ui-kit/Select/Option';
 
 export interface FormConsents {
@@ -132,7 +132,7 @@ export interface LeadFormState extends FormConsents, FormStateDeliveryType {
   addressMatch?: boolean;
   confirmationIncome?: Option;
   currency?: string;
-  paymentSystem?: PaymentSystem;
+  paymentSystem?: Option;
   cardCategory?: Option;
   codeWord?: string;
   esiaAccountTypeCd?: Option;

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

@@ -50,7 +50,10 @@ const renderStatus = (status: STATUS_TYPE, handleExpire: () => void) => {
   const statusesMap: Record<STATUS_TYPE, VNode> = {
     IN_PROCESS: <PendingStatusContent handleExpireTimer={handleExpire} />,
     CANCELLED: <FailedStatusContent />,
+    FAILED: <FailedStatusContent />,
+    DRAFT: <FailedStatusContent />,
     APPROVED: <SuccessStatusContent />,
+    PRE_DECISION: <SuccessStatusContent />,
     REVISION: <ReworkStatusContent />,
   };
 

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

@@ -2,7 +2,7 @@ import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 
 export const formStateMap: Partial<LeadFormState>[] = [
   {
-    paymentSystem: { name: '', type: '' },
+    paymentSystem: { key: '', text: '' },
     currency: '810',
     codeWord: '',
   },

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

@@ -49,7 +49,10 @@ const renderStatus = (status: STATUS_TYPE, handleExpire: () => void) => {
   const statusesMap: Record<STATUS_TYPE, VNode> = {
     IN_PROCESS: <PendingStatusContent handleExpireTimer={handleExpire} />,
     CANCELLED: <FailedStatusContent />,
+    FAILED: <FailedStatusContent />,
+    DRAFT: <FailedStatusContent />,
     APPROVED: <SuccessStatusContent />,
+    PRE_DECISION: <SuccessStatusContent />,
     REVISION: <ReworkStatusContent />,
   };
 

package/mobile/src/ui-kit/DraftDialog/parseDraftTask.ts

@@ -11,14 +11,16 @@ import {
 
 export const parseDraftTask = (task: Task): LeadFormState => {
   const participant = task.participants[0];
+  const {
+    classCard: cardCategory,
+    codeWord,
+    paymentSystemTypeCd: paymentSystem,
+    currencyCode: currency,
+  } = task;
 
   const { loanAmount: moneyValue, creditPeriod: monthsValue, paymentTypeCd } = task;
 
   const {
-    currencyCode: currency,
-    paymentSystemTypeCd: paymentSystem,
-    classCard: cardCategory,
-    codeWord,
     birthDate: limitedBirthday,
     midname: middleName,
     name,
@@ -63,11 +65,12 @@ export const parseDraftTask = (task: Task): LeadFormState => {
     creditInRshbCd,
     payrollCardRshbFlg: isInsurance,
     consentInsuranceFlg: isSalaryClient,
+    incomeCertificateCd,
   } = participant;
 
   return {
     currency: currency?.key,
-    paymentSystem,
+    paymentSystem: getSelectValue(paymentSystem),
     cardCategory: getSelectValue(cardCategory),
     codeWord,
     limitedBirthday,
@@ -102,6 +105,7 @@ export const parseDraftTask = (task: Task): LeadFormState => {
     familyMembers: familyMembers?.toString(),
     dependents: dependents?.toString(),
     conscription: getSelectValue(conscription),
+    confirmationIncome: getSelectValue(incomeCertificateCd),
     snils,
     armyIdFlg,
     bankruptcyFlg,

package/mobile/src/ui-kit/FormField/Fields/CardCategoryField.tsx

@@ -10,7 +10,7 @@ export const CardCategoryField = JSX<CustomFieldProps>(({ field, input }) => {
   const [cardTypes, setCardTypes] = useState<CardTypeData[]>([]);
   const [programId] = useLocalStorage<string>('programId');
   const { value: selectedCardCategory, onChange: cardCategoryChange } = field('cardCategory');
-  const selectedPaymentSystem = field('paymentSystem')?.value?.type;
+  const selectedPaymentSystem = field('paymentSystem')?.value?.key;
 
   useEffect(() => {
     if (selectedPaymentSystem && programId) {

package/mobile/src/ui-kit/FormField/Fields/PaymentSystemField.tsx

@@ -1,9 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { getPaymentSystems } from '../../../api/RetailAPI/getPaymentSystems';
-import { type PaymentSystem } from '../../../api/RetailAPI/updateUserTask';
 import { useLocalStorage } from '../../../hooks/useLocalStorage';
 import { RadioButtonGroupControl } from '../../RadioButtonGroup/RadioButtonGroupControl';
+import { type Option } from '../../Select/Option';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -12,7 +12,7 @@ export const PaymentSystemField = JSX<CustomFieldProps>(({ field, input }) => {
   const { value, onChange } = field('paymentSystem');
   const [programId] = useLocalStorage<string>('programId');
 
-  const [paymentSystemOptions, setPaymentSystemOptions] = useState<PaymentSystem[]>([]);
+  const [paymentSystemOptions, setPaymentSystemOptions] = useState<Option[]>([]);
 
   useEffect(() => {
     if (programId) {
@@ -24,7 +24,7 @@ export const PaymentSystemField = JSX<CustomFieldProps>(({ field, input }) => {
   }, []);
 
   const handleChange = useCallback(
-    (type: string) => onChange?.(paymentSystemOptions?.find((_) => _.type === type)),
+    (type: string) => onChange?.(paymentSystemOptions?.find((_) => _.key === type)),
     [paymentSystemOptions, onChange],
   );
 
@@ -34,11 +34,11 @@ export const PaymentSystemField = JSX<CustomFieldProps>(({ field, input }) => {
       orientation="horizontal"
       items={formatPaymentSystems(paymentSystemOptions)}
       {...getValidation(field('paymentSystem'), validatorObj.paymentSystem, input?.required)}
-      value={value?.type}
+      value={value?.key}
       onChange={handleChange}
     />
   );
 });
 
-const formatPaymentSystems = (paymentSystems: PaymentSystem[]) =>
-  paymentSystems?.map((_) => ({ id: _.type, text: _.name })) ?? [];
+const formatPaymentSystems = (paymentSystems: Option[]) =>
+  paymentSystems?.map((_) => ({ id: _.key, text: _.text })) ?? [];

package/package.json

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

package/src/api/RetailAPI/draftTasksKZO.ts

@@ -1,7 +1,12 @@
+import { type Option } from '../../ui-kit/Select/Option';
 import { fetchRetailJSON } from './doRequest';
 import { type Participant, type PaymentType } from './updateUserTask';
 
 export type Task = {
+  currencyCode?: { key: string };
+  paymentSystemTypeCd?: Option;
+  classCard?: Option;
+  codeWord?: string;
   courierDeliveryFlg?: boolean;
   creditPeriod?: number;
   creditProgram: {

package/src/api/RetailAPI/getPaymentSystems.ts

@@ -1,5 +1,10 @@
+import { type Option } from '../../ui-kit/Select/Option';
 import { fetchRetailJSON } from './doRequest';
-import { type PaymentSystem } from './updateUserTask';
+
+type PaymentSystem = {
+  name: string;
+  type: string;
+};
 
 type PaymentSystemResponse = {
   paymentSystems?: PaymentSystem[];
@@ -14,5 +19,11 @@ export const getPaymentSystems = async (creditProgramId: string) => {
     },
   );
 
-  return data?.paymentSystems || [];
+  return formatData(data?.paymentSystems || []);
 };
+
+const formatData = (paymentSystems: PaymentSystem[]): Option[] =>
+  paymentSystems.map((_) => ({
+    key: _.type,
+    text: _.name,
+  }));

package/src/api/RetailAPI/getTaskStatus.ts

@@ -4,6 +4,11 @@ export enum STATUS_TYPE {
   process = 'IN_PROCESS',
   ok = 'APPROVED',
   fail = 'CANCELLED',
+  pre_decision = 'PRE_DECISION',
+  approved = 'APPROVED',
+  cancelled = 'CANCELLED',
+  failed = 'FAILED',
+  draft = 'DRAFT',
   rework = 'REVISION',
 }
 

package/src/api/RetailAPI/updateUserTask.ts

@@ -41,11 +41,6 @@ export type PaymentType = {
   value: string;
 };
 
-export type PaymentSystem = {
-  name: string;
-  type: string;
-};
-
 export type Participant = {
   birthDate?: string;
   id: number;
@@ -110,7 +105,7 @@ export type Participant = {
     value: string;
   };
   currencyCode?: { key: string };
-  paymentSystemTypeCd?: PaymentSystem;
+  paymentSystemTypeCd?: Option;
   classCard?: Option;
   codeWord?: string;
 };

package/src/components/ApplicationLeadForm/LeadFormState.ts

@@ -1,4 +1,4 @@
-import { type PaymentSystem, type PaymentType } from '../../api/RetailAPI/updateUserTask';
+import { type PaymentType } from '../../api/RetailAPI/updateUserTask';
 import { type Option } from '../../ui-kit/Select/Option';
 
 export interface FormConsents {
@@ -132,7 +132,7 @@ export interface LeadFormState extends FormConsents, FormStateDeliveryType {
   addressMatch?: boolean;
   confirmationIncome?: Option;
   currency?: string;
-  paymentSystem?: PaymentSystem;
+  paymentSystem?: Option;
   cardCategory?: Option;
   codeWord?: string;
   esiaAccountTypeCd?: Option;

package/src/components/CreditCardForm/CreditCardFormStatusTracker.tsx

@@ -50,7 +50,10 @@ const renderStatus = (status: STATUS_TYPE, handleExpire: () => void) => {
   const statusesMap: Record<STATUS_TYPE, VNode> = {
     IN_PROCESS: <PendingStatusContent handleExpireTimer={handleExpire} />,
     CANCELLED: <FailedStatusContent />,
+    FAILED: <FailedStatusContent />,
+    DRAFT: <FailedStatusContent />,
     APPROVED: <SuccessStatusContent />,
+    PRE_DECISION: <SuccessStatusContent />,
     REVISION: <ReworkStatusContent />,
   };
 

package/src/components/CreditCardForm/formStateMap.tsx

@@ -2,7 +2,7 @@ import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 
 export const formStateMap: Partial<LeadFormState>[] = [
   {
-    paymentSystem: { name: '', type: '' },
+    paymentSystem: { key: '', text: '' },
     currency: '810',
     codeWord: '',
   },

package/src/components/CreditForm/CreditFormStatusTracker.tsx

@@ -49,7 +49,10 @@ const renderStatus = (status: STATUS_TYPE, handleExpire: () => void) => {
   const statusesMap: Record<STATUS_TYPE, VNode> = {
     IN_PROCESS: <PendingStatusContent handleExpireTimer={handleExpire} />,
     CANCELLED: <FailedStatusContent />,
+    FAILED: <FailedStatusContent />,
+    DRAFT: <FailedStatusContent />,
     APPROVED: <SuccessStatusContent />,
+    PRE_DECISION: <SuccessStatusContent />,
     REVISION: <ReworkStatusContent />,
   };
 

package/src/ui-kit/DraftDialog/parseDraftTask.ts

@@ -11,14 +11,16 @@ import {
 
 export const parseDraftTask = (task: Task): LeadFormState => {
   const participant = task.participants[0];
+  const {
+    classCard: cardCategory,
+    codeWord,
+    paymentSystemTypeCd: paymentSystem,
+    currencyCode: currency,
+  } = task;
 
   const { loanAmount: moneyValue, creditPeriod: monthsValue, paymentTypeCd } = task;
 
   const {
-    currencyCode: currency,
-    paymentSystemTypeCd: paymentSystem,
-    classCard: cardCategory,
-    codeWord,
     birthDate: limitedBirthday,
     midname: middleName,
     name,
@@ -63,11 +65,12 @@ export const parseDraftTask = (task: Task): LeadFormState => {
     creditInRshbCd,
     payrollCardRshbFlg: isInsurance,
     consentInsuranceFlg: isSalaryClient,
+    incomeCertificateCd,
   } = participant;
 
   return {
     currency: currency?.key,
-    paymentSystem,
+    paymentSystem: getSelectValue(paymentSystem),
     cardCategory: getSelectValue(cardCategory),
     codeWord,
     limitedBirthday,
@@ -102,6 +105,7 @@ export const parseDraftTask = (task: Task): LeadFormState => {
     familyMembers: familyMembers?.toString(),
     dependents: dependents?.toString(),
     conscription: getSelectValue(conscription),
+    confirmationIncome: getSelectValue(incomeCertificateCd),
     snils,
     armyIdFlg,
     bankruptcyFlg,

package/src/ui-kit/FormField/Fields/CardCategoryField.tsx

@@ -10,7 +10,7 @@ export const CardCategoryField = JSX<CustomFieldProps>(({ field, input }) => {
   const [cardTypes, setCardTypes] = useState<CardTypeData[]>([]);
   const [programId] = useLocalStorage<string>('programId');
   const { value: selectedCardCategory, onChange: cardCategoryChange } = field('cardCategory');
-  const selectedPaymentSystem = field('paymentSystem')?.value?.type;
+  const selectedPaymentSystem = field('paymentSystem')?.value?.key;
 
   useEffect(() => {
     if (selectedPaymentSystem && programId) {

package/src/ui-kit/FormField/Fields/PaymentSystemField.tsx

@@ -1,9 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { getPaymentSystems } from '../../../api/RetailAPI/getPaymentSystems';
-import { type PaymentSystem } from '../../../api/RetailAPI/updateUserTask';
 import { useLocalStorage } from '../../../hooks/useLocalStorage';
 import { RadioButtonGroupControl } from '../../RadioButtonGroup/RadioButtonGroupControl';
+import { type Option } from '../../Select/Option';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -12,7 +12,7 @@ export const PaymentSystemField = JSX<CustomFieldProps>(({ field, input }) => {
   const { value, onChange } = field('paymentSystem');
   const [programId] = useLocalStorage<string>('programId');
 
-  const [paymentSystemOptions, setPaymentSystemOptions] = useState<PaymentSystem[]>([]);
+  const [paymentSystemOptions, setPaymentSystemOptions] = useState<Option[]>([]);
 
   useEffect(() => {
     if (programId) {
@@ -24,7 +24,7 @@ export const PaymentSystemField = JSX<CustomFieldProps>(({ field, input }) => {
   }, []);
 
   const handleChange = useCallback(
-    (type: string) => onChange?.(paymentSystemOptions?.find((_) => _.type === type)),
+    (type: string) => onChange?.(paymentSystemOptions?.find((_) => _.key === type)),
     [paymentSystemOptions, onChange],
   );
 
@@ -34,11 +34,11 @@ export const PaymentSystemField = JSX<CustomFieldProps>(({ field, input }) => {
       orientation="horizontal"
       items={formatPaymentSystems(paymentSystemOptions)}
       {...getValidation(field('paymentSystem'), validatorObj.paymentSystem, input?.required)}
-      value={value?.type}
+      value={value?.key}
       onChange={handleChange}
     />
   );
 });
 
-const formatPaymentSystems = (paymentSystems: PaymentSystem[]) =>
-  paymentSystems?.map((_) => ({ id: _.type, text: _.name })) ?? [];
+const formatPaymentSystems = (paymentSystems: Option[]) =>
+  paymentSystems?.map((_) => ({ id: _.key, text: _.text })) ?? [];