@redneckz/wildless-cms-uni-blocks 0.14.888 → 0.14.890
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundle/api/LeadServiceAPI.d.ts +8 -0
- package/bundle/api/getSubmitBody.d.ts +494 -0
- package/bundle/bundle.umd.js +659 -556
- package/bundle/bundle.umd.min.js +1 -1
- package/bundle/components/ApplicationForm/ApplicationFormContent.d.ts +1 -1
- package/bundle/retail/api/checkCode.d.ts +9 -1
- package/bundle/retail/api/sendCode.d.ts +1 -1
- package/bundle/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.d.ts +4 -0
- package/bundle/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.d.ts +6 -1
- package/dist/api/LeadServiceAPI.d.ts +8 -0
- package/dist/api/LeadServiceAPI.js +41 -49
- package/dist/api/LeadServiceAPI.js.map +1 -1
- package/dist/api/getSubmitBody.d.ts +494 -0
- package/dist/api/getSubmitBody.js +59 -0
- package/dist/api/getSubmitBody.js.map +1 -0
- package/dist/components/ApplicationForm/ApplicationForm.js +30 -5
- package/dist/components/ApplicationForm/ApplicationForm.js.map +1 -1
- package/dist/components/ApplicationForm/ApplicationFormContent.d.ts +1 -1
- package/dist/components/DebitForm/DebitFormProgress.js +3 -3
- package/dist/components/DebitForm/DebitFormProgress.js.map +1 -1
- package/dist/components/DebitForm/PendingStatusContent.js +1 -1
- package/dist/components/DebitForm/PendingStatusContent.js.map +1 -1
- package/dist/retail/api/checkCode.d.ts +9 -1
- package/dist/retail/api/checkCode.js +22 -1
- package/dist/retail/api/checkCode.js.map +1 -1
- package/dist/retail/api/sendCode.d.ts +1 -1
- package/dist/retail/api/sendCode.js +8 -2
- package/dist/retail/api/sendCode.js.map +1 -1
- package/dist/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.d.ts +4 -0
- package/dist/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.js +10 -4
- package/dist/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.js.map +1 -1
- package/dist/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.d.ts +6 -1
- package/dist/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.js +7 -4
- package/dist/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.js.map +1 -1
- package/dist/retail/utils/mockLocalStorage.js +2 -2
- package/dist/retail/utils/mockLocalStorage.js.map +1 -1
- package/lib/api/LeadServiceAPI.d.ts +8 -0
- package/lib/api/LeadServiceAPI.js +41 -49
- package/lib/api/LeadServiceAPI.js.map +1 -1
- package/lib/api/getSubmitBody.d.ts +494 -0
- package/lib/api/getSubmitBody.js +54 -0
- package/lib/api/getSubmitBody.js.map +1 -0
- package/lib/components/ApplicationForm/ApplicationForm.fixture.d.ts +1 -0
- package/lib/components/ApplicationForm/ApplicationForm.js +30 -5
- package/lib/components/ApplicationForm/ApplicationForm.js.map +1 -1
- package/lib/components/ApplicationForm/ApplicationFormContent.d.ts +1 -1
- package/lib/components/DebitForm/DebitFormProgress.js +4 -4
- package/lib/components/DebitForm/DebitFormProgress.js.map +1 -1
- package/lib/components/DebitForm/PendingStatusContent.js +1 -1
- package/lib/components/DebitForm/PendingStatusContent.js.map +1 -1
- package/lib/retail/api/checkCode.d.ts +9 -1
- package/lib/retail/api/checkCode.js +22 -1
- package/lib/retail/api/checkCode.js.map +1 -1
- package/lib/retail/api/sendCode.d.ts +1 -1
- package/lib/retail/api/sendCode.js +7 -1
- package/lib/retail/api/sendCode.js.map +1 -1
- package/lib/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.d.ts +4 -0
- package/lib/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.js +10 -4
- package/lib/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.js.map +1 -1
- package/lib/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.d.ts +6 -1
- package/lib/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.js +6 -3
- package/lib/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.js.map +1 -1
- package/lib/retail/utils/mockLocalStorage.js +2 -2
- package/lib/retail/utils/mockLocalStorage.js.map +1 -1
- package/mobile/bundle/api/LeadServiceAPI.d.ts +8 -0
- package/mobile/bundle/api/getSubmitBody.d.ts +494 -0
- package/mobile/bundle/bundle.umd.js +659 -556
- package/mobile/bundle/bundle.umd.min.js +1 -1
- package/mobile/bundle/components/ApplicationForm/ApplicationFormContent.d.ts +1 -1
- package/mobile/bundle/retail/api/checkCode.d.ts +9 -1
- package/mobile/bundle/retail/api/sendCode.d.ts +1 -1
- package/mobile/bundle/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.d.ts +4 -0
- package/mobile/bundle/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.d.ts +6 -1
- package/mobile/dist/api/LeadServiceAPI.d.ts +8 -0
- package/mobile/dist/api/LeadServiceAPI.js +41 -49
- package/mobile/dist/api/LeadServiceAPI.js.map +1 -1
- package/mobile/dist/api/getSubmitBody.d.ts +494 -0
- package/mobile/dist/api/getSubmitBody.js +59 -0
- package/mobile/dist/api/getSubmitBody.js.map +1 -0
- package/mobile/dist/components/ApplicationForm/ApplicationForm.js +30 -5
- package/mobile/dist/components/ApplicationForm/ApplicationForm.js.map +1 -1
- package/mobile/dist/components/ApplicationForm/ApplicationFormContent.d.ts +1 -1
- package/mobile/dist/components/DebitForm/DebitFormProgress.js +3 -3
- package/mobile/dist/components/DebitForm/DebitFormProgress.js.map +1 -1
- package/mobile/dist/components/DebitForm/PendingStatusContent.js +1 -1
- package/mobile/dist/components/DebitForm/PendingStatusContent.js.map +1 -1
- package/mobile/dist/retail/api/checkCode.d.ts +9 -1
- package/mobile/dist/retail/api/checkCode.js +22 -1
- package/mobile/dist/retail/api/checkCode.js.map +1 -1
- package/mobile/dist/retail/api/sendCode.d.ts +1 -1
- package/mobile/dist/retail/api/sendCode.js +8 -2
- package/mobile/dist/retail/api/sendCode.js.map +1 -1
- package/mobile/dist/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.d.ts +4 -0
- package/mobile/dist/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.js +10 -4
- package/mobile/dist/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.js.map +1 -1
- package/mobile/dist/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.d.ts +6 -1
- package/mobile/dist/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.js +7 -4
- package/mobile/dist/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.js.map +1 -1
- package/mobile/dist/retail/utils/mockLocalStorage.js +2 -2
- package/mobile/dist/retail/utils/mockLocalStorage.js.map +1 -1
- package/mobile/lib/api/LeadServiceAPI.d.ts +8 -0
- package/mobile/lib/api/LeadServiceAPI.js +41 -49
- package/mobile/lib/api/LeadServiceAPI.js.map +1 -1
- package/mobile/lib/api/getSubmitBody.d.ts +494 -0
- package/mobile/lib/api/getSubmitBody.js +54 -0
- package/mobile/lib/api/getSubmitBody.js.map +1 -0
- package/mobile/lib/components/ApplicationForm/ApplicationForm.js +30 -5
- package/mobile/lib/components/ApplicationForm/ApplicationForm.js.map +1 -1
- package/mobile/lib/components/ApplicationForm/ApplicationFormContent.d.ts +1 -1
- package/mobile/lib/components/DebitForm/DebitFormProgress.js +4 -4
- package/mobile/lib/components/DebitForm/DebitFormProgress.js.map +1 -1
- package/mobile/lib/components/DebitForm/PendingStatusContent.js +1 -1
- package/mobile/lib/components/DebitForm/PendingStatusContent.js.map +1 -1
- package/mobile/lib/retail/api/checkCode.d.ts +9 -1
- package/mobile/lib/retail/api/checkCode.js +22 -1
- package/mobile/lib/retail/api/checkCode.js.map +1 -1
- package/mobile/lib/retail/api/sendCode.d.ts +1 -1
- package/mobile/lib/retail/api/sendCode.js +7 -1
- package/mobile/lib/retail/api/sendCode.js.map +1 -1
- package/mobile/lib/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.d.ts +4 -0
- package/mobile/lib/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.js +10 -4
- package/mobile/lib/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.js.map +1 -1
- package/mobile/lib/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.d.ts +6 -1
- package/mobile/lib/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.js +6 -3
- package/mobile/lib/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.js.map +1 -1
- package/mobile/lib/retail/utils/mockLocalStorage.js +2 -2
- package/mobile/lib/retail/utils/mockLocalStorage.js.map +1 -1
- package/mobile/src/api/LeadServiceAPI.ts +64 -82
- package/mobile/src/api/getSubmitBody.ts +94 -0
- package/mobile/src/components/ApplicationForm/ApplicationForm.example.json +2 -2
- package/mobile/src/components/ApplicationForm/ApplicationForm.tsx +33 -4
- package/mobile/src/components/ApplicationForm/ApplicationFormContent.ts +1 -1
- package/mobile/src/components/DebitForm/DebitFormProgress.tsx +4 -9
- package/mobile/src/components/DebitForm/PendingStatusContent.tsx +1 -1
- package/mobile/src/retail/api/checkCode.ts +47 -2
- package/mobile/src/retail/api/sendCode.ts +9 -1
- package/mobile/src/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.tsx +29 -8
- package/mobile/src/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.tsx +18 -5
- package/mobile/src/retail/utils/mockLocalStorage.ts +15 -9
- package/package.json +1 -1
- package/src/api/LeadServiceAPI.ts +64 -82
- package/src/api/getSubmitBody.ts +94 -0
- package/src/components/ApplicationForm/ApplicationForm.example.json +2 -2
- package/src/components/ApplicationForm/ApplicationForm.fixture.mobile.tsx +2 -2
- package/src/components/ApplicationForm/ApplicationForm.fixture.tsx +24 -2
- package/src/components/ApplicationForm/ApplicationForm.tsx +33 -4
- package/src/components/ApplicationForm/ApplicationFormContent.ts +1 -1
- package/src/components/DebitForm/DebitFormProgress.tsx +4 -9
- package/src/components/DebitForm/PendingStatusContent.tsx +1 -1
- package/src/retail/api/checkCode.ts +47 -2
- package/src/retail/api/sendCode.ts +9 -1
- package/src/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.tsx +29 -8
- package/src/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.tsx +18 -5
- package/src/retail/utils/mockLocalStorage.ts +15 -9
|
@@ -1,13 +1,21 @@
|
|
|
1
|
+
import { type LeadRequest } from '../../api/LeadServiceAPI';
|
|
1
2
|
export declare type CheckCodeBody = {
|
|
2
3
|
smsText: string;
|
|
3
4
|
smsCodesSetName: {
|
|
4
5
|
key: 'AUTHENTICATION' | 'SEND_TASK';
|
|
5
6
|
};
|
|
7
|
+
reqId?: string;
|
|
8
|
+
body?: LeadRequest;
|
|
6
9
|
};
|
|
7
10
|
export declare type CheckCodeResponse = {
|
|
8
11
|
access_token: string;
|
|
9
12
|
expires_in: number;
|
|
10
13
|
refresh_token: string;
|
|
11
14
|
};
|
|
12
|
-
export declare
|
|
15
|
+
export declare type MainBody = {
|
|
16
|
+
code: string;
|
|
17
|
+
reqId: string;
|
|
18
|
+
body: LeadRequest;
|
|
19
|
+
};
|
|
20
|
+
export declare const checkCode: (body: CheckCodeBody, isRetail: boolean) => Promise<void>;
|
|
13
21
|
export declare const saveToken: (data: CheckCodeResponse | null) => void;
|
|
@@ -1,9 +1,30 @@
|
|
|
1
|
+
import { LeadServiceAPI } from '../../api/LeadServiceAPI.js';
|
|
1
2
|
import { fetchRetailJSON } from './doRequest.js';
|
|
2
|
-
|
|
3
|
+
const API = LeadServiceAPI();
|
|
4
|
+
export const checkCode = async (body, isRetail) => {
|
|
5
|
+
const transformedBody = transformBody(body, isRetail);
|
|
6
|
+
return isRetail
|
|
7
|
+
? fetchRetailJSON('/sms/checkCode', 'POST', transformedBody).then(saveToken)
|
|
8
|
+
: fetchMain(transformedBody).then((res) => {
|
|
9
|
+
if (res === null) {
|
|
10
|
+
throw new Error('Неверный код');
|
|
11
|
+
}
|
|
12
|
+
});
|
|
13
|
+
};
|
|
3
14
|
export const saveToken = (data) => {
|
|
4
15
|
if (data?.access_token && data?.refresh_token) {
|
|
5
16
|
globalThis.sessionStorage.setItem('accessToken', data.access_token);
|
|
6
17
|
globalThis.sessionStorage.setItem('refreshToken', data.refresh_token);
|
|
7
18
|
}
|
|
8
19
|
};
|
|
20
|
+
const fetchMain = (body) => API.checkCode(body);
|
|
21
|
+
const transformBody = ({ smsText, smsCodesSetName, body, reqId }, isRetail) => {
|
|
22
|
+
if (isRetail) {
|
|
23
|
+
return { smsText, smsCodesSetName };
|
|
24
|
+
}
|
|
25
|
+
if (!reqId || !body) {
|
|
26
|
+
throw new Error('Произошла ошибка, попробуйте позднее');
|
|
27
|
+
}
|
|
28
|
+
return { code: smsText, reqId, body };
|
|
29
|
+
};
|
|
9
30
|
//# sourceMappingURL=checkCode.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkCode.js","sourceRoot":"","sources":["../../../src/retail/api/checkCode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"checkCode.js","sourceRoot":"","sources":["../../../src/retail/api/checkCode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAoB,MAAM,0BAA0B,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,MAAM,GAAG,GAAG,cAAc,EAAE,CAAC;AAgC7B,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAAE,IAAmB,EAAE,QAAiB,EAAE,EAAE;IACxE,MAAM,eAAe,GAAG,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAEtD,OAAO,QAAQ;QACb,CAAC,CAAC,eAAe,CAAoB,gBAAgB,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;QAC/F,CAAC,CAAC,SAAS,CAAC,eAA2B,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YAClD,IAAI,GAAG,KAAK,IAAI,EAAE;gBAChB,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;aACjC;QACH,CAAC,CAAC,CAAC;AACT,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAA8B,EAAE,EAAE;IAC1D,IAAI,IAAI,EAAE,YAAY,IAAI,IAAI,EAAE,aAAa,EAAE;QAC7C,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QACpE,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,cAAc,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;KACvE;AACH,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,IAAc,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;AAE1D,MAAM,aAAa,GAAG,CACpB,EAAE,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,KAAK,EAAiB,EACxD,QAAiB,EACA,EAAE;IACnB,IAAI,QAAQ,EAAE;QACZ,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC;KACrC;IAED,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;KACzD;IAED,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AACxC,CAAC,CAAC"}
|
|
@@ -4,4 +4,4 @@ export declare type SendCodeBody = {
|
|
|
4
4
|
key: 'AUTHENTICATION' | 'SEND_TASK';
|
|
5
5
|
};
|
|
6
6
|
};
|
|
7
|
-
export declare const sendCode: (body: SendCodeBody) => Promise<boolean>;
|
|
7
|
+
export declare const sendCode: (body: SendCodeBody, isRetail: boolean) => Promise<string | null> | Promise<boolean>;
|
|
@@ -1,5 +1,11 @@
|
|
|
1
|
+
import { LeadServiceAPI } from '../../api/LeadServiceAPI.js';
|
|
1
2
|
import { doRequest } from './doRequest.js';
|
|
2
|
-
|
|
3
|
+
const API = LeadServiceAPI();
|
|
4
|
+
export const sendCode = (body, isRetail) => {
|
|
5
|
+
return isRetail ? fetchRetail(body) : fetchMain(body);
|
|
6
|
+
};
|
|
7
|
+
const fetchRetail = (body) => doRequest('/sms/sendCode', 'POST', body)
|
|
3
8
|
.then((res) => res.text())
|
|
4
9
|
.then((text) => text === 'OK');
|
|
10
|
+
const fetchMain = (body) => API.sendCode({ phone: body.phoneNumber });
|
|
5
11
|
//# sourceMappingURL=sendCode.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sendCode.js","sourceRoot":"","sources":["../../../src/retail/api/sendCode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"sendCode.js","sourceRoot":"","sources":["../../../src/retail/api/sendCode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,MAAM,GAAG,GAAG,cAAc,EAAE,CAAC;AAS7B,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,IAAkB,EAAE,QAAiB,EAAE,EAAE;IAChE,OAAO,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;AACxD,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,IAAkB,EAAE,EAAE,CACzC,SAAS,CAAC,eAAe,EAAE,MAAM,EAAE,IAAI,CAAC;KACrC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;KACzB,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;AAEnC,MAAM,SAAS,GAAG,CAAC,IAAkB,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC"}
|
|
@@ -1,8 +1,12 @@
|
|
|
1
|
+
import { type LeadRequest } from '../../../api/LeadServiceAPI';
|
|
1
2
|
import type { OnCloseProps } from '../../../model/OnCloseProps';
|
|
2
3
|
export interface VerifyPhoneDialogProps extends OnCloseProps {
|
|
3
4
|
phone: string;
|
|
4
5
|
withDescription?: boolean;
|
|
5
6
|
consents?: string[];
|
|
6
7
|
onSuccess?: (smsCode?: string) => void;
|
|
8
|
+
formatData?: LeadRequest;
|
|
9
|
+
reqId?: string;
|
|
10
|
+
isRetail?: boolean;
|
|
7
11
|
}
|
|
8
12
|
export declare const VerifyPhoneDialog: import("@redneckz/uni-jsx").UNIComponent<VerifyPhoneDialogProps, any, any>;
|
|
@@ -20,10 +20,16 @@ import { InputCode } from './InputCode.js';
|
|
|
20
20
|
import { SubmitButton } from './SubmitButton.js';
|
|
21
21
|
import { TIME_TO_RESEND, useVerifyPhoneDialogSubmit, } from './useVerifyPhoneDialogSubmit.js';
|
|
22
22
|
const CODE_LENGTH = 4;
|
|
23
|
-
export const VerifyPhoneDialog = JSX(({ phone, withDescription = true, consents, onSuccess = noop, onClose = noop }) => {
|
|
23
|
+
export const VerifyPhoneDialog = JSX(({ phone, withDescription = true, consents, onSuccess = noop, onClose = noop, formatData, reqId, isRetail = true, }) => {
|
|
24
24
|
const [values, setValues] = useState(Array(CODE_LENGTH).fill(''));
|
|
25
25
|
const sessionStore = useSessionStore();
|
|
26
|
-
const { handleSubmit, hasError, errorText, isLoading, timeNextReq, isSubmitButtonDisabled, setTimeNextReq, setErrorText, } = useVerifyPhoneDialogSubmit({
|
|
26
|
+
const { handleSubmit, hasError, errorText, isLoading, timeNextReq, isSubmitButtonDisabled, setTimeNextReq, setErrorText, } = useVerifyPhoneDialogSubmit({
|
|
27
|
+
values,
|
|
28
|
+
onSuccess,
|
|
29
|
+
formatData,
|
|
30
|
+
reqId,
|
|
31
|
+
isRetail,
|
|
32
|
+
});
|
|
27
33
|
const captchaDialog = useDialog(CaptchaDialog);
|
|
28
34
|
const phoneNumber = formatPhone(phone);
|
|
29
35
|
const restartTimer = useCountDownTimer({ seconds: timeNextReq, onTick: setTimeNextReq });
|
|
@@ -31,7 +37,7 @@ export const VerifyPhoneDialog = JSX(({ phone, withDescription = true, consents,
|
|
|
31
37
|
const isSuccessSendCode = await sendCode({
|
|
32
38
|
phoneNumber,
|
|
33
39
|
smsCodesSetName: { key: 'AUTHENTICATION' },
|
|
34
|
-
});
|
|
40
|
+
}, isRetail);
|
|
35
41
|
if (isSuccessSendCode) {
|
|
36
42
|
setTimeNextReq(TIME_TO_RESEND);
|
|
37
43
|
restartTimer(TIME_TO_RESEND);
|
|
@@ -46,7 +52,7 @@ export const VerifyPhoneDialog = JSX(({ phone, withDescription = true, consents,
|
|
|
46
52
|
}
|
|
47
53
|
}, [phoneNumber, restartTimer, onClose]);
|
|
48
54
|
useEffect(() => {
|
|
49
|
-
if (!sessionStore.smsCode?.sendTime) {
|
|
55
|
+
if (!sessionStore.smsCode?.sendTime && isRetail) {
|
|
50
56
|
handleSendCode();
|
|
51
57
|
}
|
|
52
58
|
}, []);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VerifyPhoneDialog.js","sourceRoot":"","sources":["../../../../src/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.tsx"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"VerifyPhoneDialog.js","sourceRoot":"","sources":["../../../../src/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,12 @@
|
|
|
1
|
+
import { type LeadRequest } from '../../../api/LeadServiceAPI';
|
|
1
2
|
export declare const TIME_TO_RESEND = 180;
|
|
3
|
+
export declare const TIME_TO_MAIN_EXPIRE = 600;
|
|
2
4
|
declare type useVerifyPhoneDialogSubmitProps = {
|
|
3
5
|
values: string[];
|
|
4
6
|
onSuccess?: (smsCode?: string) => void;
|
|
7
|
+
formatData?: LeadRequest;
|
|
8
|
+
reqId?: string;
|
|
9
|
+
isRetail?: boolean;
|
|
5
10
|
};
|
|
6
11
|
export interface SmsCodeStore {
|
|
7
12
|
smsCode: {
|
|
@@ -9,7 +14,7 @@ export interface SmsCodeStore {
|
|
|
9
14
|
attempts?: number;
|
|
10
15
|
};
|
|
11
16
|
}
|
|
12
|
-
export declare const useVerifyPhoneDialogSubmit: ({ values, onSuccess, }: useVerifyPhoneDialogSubmitProps) => {
|
|
17
|
+
export declare const useVerifyPhoneDialogSubmit: ({ values, onSuccess, formatData, reqId, isRetail, }: useVerifyPhoneDialogSubmitProps) => {
|
|
13
18
|
handleSubmit: () => Promise<void>;
|
|
14
19
|
hasError: boolean;
|
|
15
20
|
errorText: string;
|
|
@@ -3,7 +3,8 @@ import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
|
|
|
3
3
|
import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
|
|
4
4
|
import { checkCode } from '../../api/checkCode.js';
|
|
5
5
|
export const TIME_TO_RESEND = 180;
|
|
6
|
-
export const
|
|
6
|
+
export const TIME_TO_MAIN_EXPIRE = 600;
|
|
7
|
+
export const useVerifyPhoneDialogSubmit = ({ values, onSuccess, formatData, reqId, isRetail = true, }) => {
|
|
7
8
|
const sessionStore = useSessionStore();
|
|
8
9
|
const attempts = sessionStore.smsCode?.attempts || 0;
|
|
9
10
|
const timer = Math.max(getTimer(sessionStore.smsCode?.sendTime || Date.now()), 0);
|
|
@@ -23,7 +24,9 @@ export const useVerifyPhoneDialogSubmit = ({ values, onSuccess, }) => {
|
|
|
23
24
|
await checkCode({
|
|
24
25
|
smsText: values.join(''),
|
|
25
26
|
smsCodesSetName: { key: 'AUTHENTICATION' },
|
|
26
|
-
|
|
27
|
+
body: isRetail ? undefined : formatData,
|
|
28
|
+
reqId: isRetail ? undefined : reqId,
|
|
29
|
+
}, isRetail);
|
|
27
30
|
setTimeNextReq(0);
|
|
28
31
|
resetError();
|
|
29
32
|
sessionStore.smsCode = null;
|
|
@@ -37,7 +40,7 @@ export const useVerifyPhoneDialogSubmit = ({ values, onSuccess, }) => {
|
|
|
37
40
|
}
|
|
38
41
|
}, [values, attempts]);
|
|
39
42
|
useEffect(() => {
|
|
40
|
-
if (isTimeExpired) {
|
|
43
|
+
if (isTimeExpired && isRetail) {
|
|
41
44
|
setErrorText('Код просрочен');
|
|
42
45
|
}
|
|
43
46
|
else if (attempts > 2) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useVerifyPhoneDialogSubmit.js","sourceRoot":"","sources":["../../../../src/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;
|
|
1
|
+
{"version":3,"file":"useVerifyPhoneDialogSubmit.js","sourceRoot":"","sources":["../../../../src/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.tsx"],"names":[],"mappings":"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"}
|
|
@@ -11,11 +11,11 @@ export const mockLocalStorage = async () => {
|
|
|
11
11
|
await sendCode({
|
|
12
12
|
phoneNumber: PHONE,
|
|
13
13
|
smsCodesSetName: { key: 'AUTHENTICATION' },
|
|
14
|
-
});
|
|
14
|
+
}, true);
|
|
15
15
|
await checkCode({
|
|
16
16
|
smsCodesSetName: { key: 'AUTHENTICATION' },
|
|
17
17
|
smsText: '1234',
|
|
18
|
-
});
|
|
18
|
+
}, true);
|
|
19
19
|
const task = {
|
|
20
20
|
taskId: globalThis.localStorage.getItem('taskId'),
|
|
21
21
|
participantId: globalThis.localStorage.getItem('participantId'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mockLocalStorage.js","sourceRoot":"","sources":["../../../src/retail/utils/mockLocalStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,MAAM,KAAK,GAAG,cAAc,CAAC;AAC7B,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;IACzC,MAAM,SAAS,GAAG,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,UAAU,CAAC;IAE7E,MAAM,SAAS,GACb,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC;QAC5C,CAAC,MAAM,iBAAiB,CAAC,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;IAE3D,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"mockLocalStorage.js","sourceRoot":"","sources":["../../../src/retail/utils/mockLocalStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,MAAM,KAAK,GAAG,cAAc,CAAC;AAC7B,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;IACzC,MAAM,SAAS,GAAG,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,UAAU,CAAC;IAE7E,MAAM,SAAS,GACb,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC;QAC5C,CAAC,MAAM,iBAAiB,CAAC,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;IAE3D,MAAM,QAAQ,CACZ;QACE,WAAW,EAAE,KAAK;QAClB,eAAe,EAAE,EAAE,GAAG,EAAE,gBAAgB,EAAE;KAC3C,EACD,IAAI,CACL,CAAC;IAEF,MAAM,SAAS,CACb;QACE,eAAe,EAAE,EAAE,GAAG,EAAE,gBAAgB,EAAE;QAC1C,OAAO,EAAE,MAAM;KAChB,EACD,IAAI,CACL,CAAC;IAEF,MAAM,IAAI,GAAG;QACX,MAAM,EAAE,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC;QACjD,aAAa,EAAE,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,eAAe,CAAC;KAChE,CAAC;IAEF,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;QACvC,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QACjF,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;KAC5B;IAED,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IACxD,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;IAChE,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC/D,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,eAAe,EAAE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;AAC/E,CAAC,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { type JSONRecord, type JSONScalar } from '@redneckz/json-op';
|
|
2
2
|
import { type Router } from '../external/useRouter';
|
|
3
|
-
import {
|
|
4
|
-
import { formatPhone } from '../utils/formatPhone';
|
|
3
|
+
import { type MainBody } from '../retail/api/checkCode';
|
|
5
4
|
import { API_BASE_URI } from './apiBaseUrl';
|
|
5
|
+
import { getPhoneBody, getSubmitBody } from './getSubmitBody';
|
|
6
6
|
|
|
7
7
|
export type LeadRequest = Record<string, JSONRecord | JSONScalar | null> & {
|
|
8
8
|
typeForm?: string;
|
|
@@ -17,63 +17,30 @@ export type LeadRequest = Record<string, JSONRecord | JSONScalar | null> & {
|
|
|
17
17
|
companyNameByInn?: string;
|
|
18
18
|
};
|
|
19
19
|
|
|
20
|
-
type
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
20
|
+
export type CheckCodeProps = MainBody;
|
|
21
|
+
|
|
22
|
+
type VerifiedLeadRequest = {
|
|
23
|
+
requestId: string;
|
|
24
|
+
confirmationCode: string;
|
|
25
|
+
leadRequest: LeadRequest;
|
|
25
26
|
};
|
|
26
27
|
|
|
28
|
+
type PhoneOnly = {
|
|
29
|
+
phone?: string;
|
|
30
|
+
};
|
|
31
|
+
|
|
32
|
+
type SubmitBody = PhoneOnly | LeadRequest | CheckCodeProps | VerifiedLeadRequest;
|
|
33
|
+
|
|
27
34
|
export function LeadServiceAPI() {
|
|
28
35
|
async function send(body: LeadRequest, router: Router, isIndividualType = false) {
|
|
29
|
-
const {
|
|
30
|
-
|
|
31
|
-
region,
|
|
32
|
-
phone = '',
|
|
33
|
-
email,
|
|
34
|
-
birthday,
|
|
35
|
-
desiredMeetingDate,
|
|
36
|
-
inn,
|
|
37
|
-
innDadata,
|
|
38
|
-
fullRegion,
|
|
39
|
-
addressBranch,
|
|
40
|
-
secondaryPhone = '',
|
|
41
|
-
bankEmpolee,
|
|
42
|
-
applicationDate,
|
|
43
|
-
serviceDirection,
|
|
44
|
-
partnerSymbolCode,
|
|
45
|
-
companyNameByInn,
|
|
46
|
-
...staticBody
|
|
47
|
-
} = body;
|
|
36
|
+
const { serviceDirection } = body;
|
|
37
|
+
|
|
48
38
|
const isNaturalPerson = isIndividualType && serviceDirection !== 'Юридическое лицо / ИП';
|
|
49
39
|
const url = `${API_BASE_URI}${isNaturalPerson ? '/lead' : '/sendcorporatelead'}`;
|
|
50
|
-
const submitBody =
|
|
51
|
-
typeForm,
|
|
52
|
-
...getRegion(region, isNaturalPerson),
|
|
53
|
-
...getEmail(email, isNaturalPerson),
|
|
54
|
-
...getPhone(phone),
|
|
55
|
-
...getFormatDate(desiredMeetingDate as string, 'desiredMeetingDate'),
|
|
56
|
-
...(isNaturalPerson ? getFormatDate(birthday as string) : { inn }),
|
|
57
|
-
...(typeForm === 'FEEDBACK'
|
|
58
|
-
? {}
|
|
59
|
-
: {
|
|
60
|
-
addressBranch,
|
|
61
|
-
bankEmpolee,
|
|
62
|
-
applicationDate,
|
|
63
|
-
...getSecondaryPhone(secondaryPhone as string),
|
|
64
|
-
}),
|
|
65
|
-
...addPageSlug(typeForm, router),
|
|
66
|
-
...formatPFForm(typeForm, { innDadata, fullRegion, partnerSymbolCode, companyNameByInn }),
|
|
67
|
-
...staticBody,
|
|
68
|
-
};
|
|
40
|
+
const submitBody = getSubmitBody(body, isNaturalPerson, router);
|
|
69
41
|
|
|
70
42
|
try {
|
|
71
|
-
const response = await
|
|
72
|
-
method: 'POST',
|
|
73
|
-
headers: { 'Content-Type': 'application/json' },
|
|
74
|
-
mode: 'cors',
|
|
75
|
-
body: JSON.stringify(submitBody),
|
|
76
|
-
});
|
|
43
|
+
const response = await LeadServiceFetch(url, submitBody);
|
|
77
44
|
|
|
78
45
|
if (!response?.ok) {
|
|
79
46
|
return null;
|
|
@@ -85,42 +52,57 @@ export function LeadServiceAPI() {
|
|
|
85
52
|
}
|
|
86
53
|
}
|
|
87
54
|
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
};
|
|
91
|
-
}
|
|
55
|
+
async function sendCode({ phone }: PhoneOnly) {
|
|
56
|
+
const submitBody = getPhoneBody(phone);
|
|
92
57
|
|
|
93
|
-
|
|
58
|
+
try {
|
|
59
|
+
const response = LeadServiceFetch(`${API_BASE_URI}/initCorporateLead`, submitBody).then(
|
|
60
|
+
async (res) => {
|
|
61
|
+
if (!res.ok) {
|
|
62
|
+
throw new Error(`Ошибка HTTP: ${res.status}`);
|
|
63
|
+
}
|
|
94
64
|
|
|
95
|
-
|
|
96
|
-
|
|
65
|
+
return await res.text();
|
|
66
|
+
},
|
|
67
|
+
);
|
|
97
68
|
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
69
|
+
return await response;
|
|
70
|
+
} catch (e) {
|
|
71
|
+
return null;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
101
74
|
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
75
|
+
async function checkCode({ reqId, code, body }: CheckCodeProps) {
|
|
76
|
+
const submitBody = {
|
|
77
|
+
requestId: reqId,
|
|
78
|
+
confimationCode: code,
|
|
79
|
+
leadRequest: getSubmitBody(body, false),
|
|
80
|
+
};
|
|
105
81
|
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
? {}
|
|
109
|
-
: { secondaryPhoneNumber: formatPhone(secondaryPhone) };
|
|
82
|
+
try {
|
|
83
|
+
const response = await LeadServiceFetch(`${API_BASE_URI}/confirmCorporateLead`, submitBody);
|
|
110
84
|
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
? {
|
|
114
|
-
inn: data?.innDadata,
|
|
115
|
-
region: data?.fullRegion,
|
|
116
|
-
partnerComments: data?.partnerSymbolCode,
|
|
117
|
-
fullname: data?.companyNameByInn,
|
|
85
|
+
if (!response?.ok) {
|
|
86
|
+
return null;
|
|
118
87
|
}
|
|
119
|
-
: {};
|
|
120
88
|
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
89
|
+
return await response.json();
|
|
90
|
+
} catch (e) {
|
|
91
|
+
return null;
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
return {
|
|
96
|
+
send,
|
|
97
|
+
sendCode,
|
|
98
|
+
checkCode,
|
|
99
|
+
};
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
const LeadServiceFetch = (url: string, submitBody: SubmitBody) =>
|
|
103
|
+
fetch(url, {
|
|
104
|
+
method: 'POST',
|
|
105
|
+
headers: { 'Content-Type': 'application/json' },
|
|
106
|
+
mode: 'cors',
|
|
107
|
+
body: JSON.stringify(submitBody),
|
|
108
|
+
});
|
|
@@ -0,0 +1,94 @@
|
|
|
1
|
+
import type { JSONRecord, JSONScalar } from '@redneckz/json-op';
|
|
2
|
+
import type { Router } from '../external/useRouter';
|
|
3
|
+
import { formatDate } from '../utils/formatDate';
|
|
4
|
+
import { formatPhone } from '../utils/formatPhone';
|
|
5
|
+
import { type LeadRequest } from './LeadServiceAPI';
|
|
6
|
+
|
|
7
|
+
type PFFormData = {
|
|
8
|
+
innDadata?: string;
|
|
9
|
+
fullRegion?: string;
|
|
10
|
+
partnerSymbolCode?: string;
|
|
11
|
+
companyNameByInn?: string;
|
|
12
|
+
};
|
|
13
|
+
|
|
14
|
+
export const getSubmitBody = (body: LeadRequest, isNaturalPerson: boolean, router?: Router) => {
|
|
15
|
+
const {
|
|
16
|
+
typeForm,
|
|
17
|
+
region,
|
|
18
|
+
phone = '',
|
|
19
|
+
email,
|
|
20
|
+
birthday,
|
|
21
|
+
desiredMeetingDate,
|
|
22
|
+
inn,
|
|
23
|
+
innDadata,
|
|
24
|
+
fullRegion,
|
|
25
|
+
addressBranch,
|
|
26
|
+
secondaryPhone = '',
|
|
27
|
+
bankEmpolee,
|
|
28
|
+
applicationDate,
|
|
29
|
+
partnerSymbolCode,
|
|
30
|
+
companyNameByInn,
|
|
31
|
+
...staticBody
|
|
32
|
+
} = body;
|
|
33
|
+
|
|
34
|
+
return {
|
|
35
|
+
typeForm,
|
|
36
|
+
...getRegion(region, isNaturalPerson),
|
|
37
|
+
...getEmail(email, isNaturalPerson),
|
|
38
|
+
...getPhone(phone),
|
|
39
|
+
...getFormatDate(desiredMeetingDate as string, 'desiredMeetingDate'),
|
|
40
|
+
...(isNaturalPerson ? getFormatDate(birthday as string) : { inn }),
|
|
41
|
+
...(typeForm === 'FEEDBACK'
|
|
42
|
+
? {}
|
|
43
|
+
: {
|
|
44
|
+
addressBranch,
|
|
45
|
+
bankEmpolee,
|
|
46
|
+
applicationDate,
|
|
47
|
+
...getSecondaryPhone(secondaryPhone as string),
|
|
48
|
+
}),
|
|
49
|
+
...addPageSlug(typeForm, router),
|
|
50
|
+
...formatPFForm(typeForm, { innDadata, fullRegion, partnerSymbolCode, companyNameByInn }),
|
|
51
|
+
...staticBody,
|
|
52
|
+
};
|
|
53
|
+
};
|
|
54
|
+
|
|
55
|
+
export const getPhoneBody = (phone?: string) => {
|
|
56
|
+
return {
|
|
57
|
+
...getPhone(phone),
|
|
58
|
+
};
|
|
59
|
+
};
|
|
60
|
+
|
|
61
|
+
export const getPhone = (phone?: string) => (phone ? { phone: formatPhone(phone) } : {});
|
|
62
|
+
|
|
63
|
+
const getFormatDate = (date?: string, key = 'birthday') =>
|
|
64
|
+
date ? { [key]: formatDate(date) } : {};
|
|
65
|
+
|
|
66
|
+
const getRegion = (region: JSONRecord | JSONScalar | null, isNaturalPerson = true) => ({
|
|
67
|
+
[isNaturalPerson ? 'regionBranch' : 'region']: region,
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
const getEmail = (email?: string, isNaturalPerson = true) => ({
|
|
71
|
+
[isNaturalPerson ? 'email' : 'mail']: email,
|
|
72
|
+
});
|
|
73
|
+
|
|
74
|
+
const getSecondaryPhone = (secondaryPhone = '') =>
|
|
75
|
+
!secondaryPhone || secondaryPhone === '+7 ('
|
|
76
|
+
? {}
|
|
77
|
+
: { secondaryPhoneNumber: formatPhone(secondaryPhone) };
|
|
78
|
+
|
|
79
|
+
const formatPFForm = (typeForm?: string, data?: PFFormData) =>
|
|
80
|
+
typeForm === 'PF'
|
|
81
|
+
? {
|
|
82
|
+
inn: data?.innDadata,
|
|
83
|
+
region: data?.fullRegion,
|
|
84
|
+
partnerComments: data?.partnerSymbolCode,
|
|
85
|
+
fullname: data?.companyNameByInn,
|
|
86
|
+
}
|
|
87
|
+
: {};
|
|
88
|
+
|
|
89
|
+
const addPageSlug = (typeForm?: string, router?: Router) =>
|
|
90
|
+
typeForm === 'UNIVERSAL'
|
|
91
|
+
? {
|
|
92
|
+
typeForm: router?.pathname?.split('/')?.at(-1) || '/',
|
|
93
|
+
}
|
|
94
|
+
: {};
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
"padding": "",
|
|
8
8
|
"title": "Заполните онлайн-заявку на эквайринг",
|
|
9
9
|
"typeForm": "ACQR",
|
|
10
|
-
"endpoint": "
|
|
10
|
+
"endpoint": "initcorporatelead",
|
|
11
11
|
"sections": [
|
|
12
12
|
{
|
|
13
13
|
"title": "Вид эквайринга и регион",
|
|
@@ -533,7 +533,7 @@
|
|
|
533
533
|
"padding": "",
|
|
534
534
|
"title": "Форма заявка",
|
|
535
535
|
"typeForm": "DPST",
|
|
536
|
-
"endpoint": "
|
|
536
|
+
"endpoint": "initcorporatelead",
|
|
537
537
|
"sections": [
|
|
538
538
|
{
|
|
539
539
|
"inputs": [
|
|
@@ -6,6 +6,7 @@ import { useAspects } from '../../hooks/useAspects/useAspects';
|
|
|
6
6
|
import { useForm, type FormFieldRegisterer } from '../../hooks/useForm/useForm';
|
|
7
7
|
import { type FormTypeFieldDef } from '../../model/FormTypeFieldDef';
|
|
8
8
|
import { type SectionsProps } from '../../model/InputSectionsType';
|
|
9
|
+
import { VerifyPhoneDialog } from '../../retail/components/VerifyPhoneDialog/VerifyPhoneDialog';
|
|
9
10
|
import { ApplicationFormLayout } from '../../ui-kit/ApplicationFormLayout/ApplicationFormLayout';
|
|
10
11
|
import { useDialog } from '../../ui-kit/DialogManager/useDialog';
|
|
11
12
|
import { getConsentDataProcessing } from '../../ui-kit/FormField/getConsentDataProcessing';
|
|
@@ -38,6 +39,7 @@ type renderSectionsType = {
|
|
|
38
39
|
const API = LeadServiceAPI();
|
|
39
40
|
|
|
40
41
|
export const ApplicationForm = UniBlock<ApplicationFormProps>(
|
|
42
|
+
// eslint-disable-next-line max-lines-per-function
|
|
41
43
|
({
|
|
42
44
|
className,
|
|
43
45
|
title,
|
|
@@ -66,14 +68,41 @@ export const ApplicationForm = UniBlock<ApplicationFormProps>(
|
|
|
66
68
|
const responseTypeDialog = useDialog(ResponseTypeDialog);
|
|
67
69
|
const aspects = useAspects();
|
|
68
70
|
|
|
71
|
+
const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
|
|
72
|
+
|
|
69
73
|
const handleSubmit = useCallback(
|
|
70
74
|
async (formData: FormState, ev: PreventableEventWithTarget) => {
|
|
71
75
|
const formatData = getFormatData({ ...formData, ...additionalParams });
|
|
72
|
-
const ok = Boolean(await API.send(formatData, router, endpoint === 'lead'));
|
|
73
76
|
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
+
if (endpoint === 'initcorporatelead') {
|
|
78
|
+
const { phone } = formatData;
|
|
79
|
+
|
|
80
|
+
const response = await API.sendCode({ phone: String(phone) });
|
|
81
|
+
|
|
82
|
+
if (!response) {
|
|
83
|
+
responseTypeDialog.open({ ok: Boolean(response), typeForm });
|
|
84
|
+
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
verifyPhoneDialog.open({
|
|
89
|
+
phone,
|
|
90
|
+
withDescription: false,
|
|
91
|
+
formatData,
|
|
92
|
+
reqId: String(response),
|
|
93
|
+
isRetail: false,
|
|
94
|
+
onSuccess: () => {
|
|
95
|
+
verifyPhoneDialog.close();
|
|
96
|
+
responseTypeDialog.open({ ok: true, typeForm });
|
|
97
|
+
},
|
|
98
|
+
});
|
|
99
|
+
} else {
|
|
100
|
+
const ok = Boolean(await API.send(formatData, router, endpoint === 'lead'));
|
|
101
|
+
|
|
102
|
+
responseTypeDialog.open({ ok, typeForm });
|
|
103
|
+
if (ok) {
|
|
104
|
+
handleAspects({ aspectsAttributes: data, aspects, ev });
|
|
105
|
+
}
|
|
77
106
|
}
|
|
78
107
|
},
|
|
79
108
|
[typeForm],
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { JSX } from '@redneckz/uni-jsx';
|
|
2
|
-
import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
|
|
3
2
|
import { ProgressBar } from '../../ui-kit/ProgressBar/ProgressBar';
|
|
4
3
|
|
|
5
4
|
export interface DebitFormProgressProps {
|
|
@@ -10,17 +9,13 @@ export interface DebitFormProgressProps {
|
|
|
10
9
|
|
|
11
10
|
export const DebitFormProgress = JSX<DebitFormProgressProps>(
|
|
12
11
|
({ step = 1, totalSteps = 2, stepsTitles = [] }) => {
|
|
13
|
-
const
|
|
12
|
+
const isFinalStep = step === totalSteps;
|
|
13
|
+
const progress = isFinalStep ? 100 : 85;
|
|
14
14
|
|
|
15
15
|
return (
|
|
16
16
|
<div className="py-lg px-5xl bg-white col-span-12">
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
Шаг {step} из {totalSteps}.
|
|
20
|
-
</span>
|
|
21
|
-
{stepsTitles[step] || null}
|
|
22
|
-
<ProgressBar step={progress} showPercentage={false} />
|
|
23
|
-
</div>
|
|
17
|
+
{stepsTitles[step] || null}
|
|
18
|
+
<ProgressBar step={progress} showPercentage={false} />
|
|
24
19
|
</div>
|
|
25
20
|
);
|
|
26
21
|
},
|