From af5a1ef35a3090e13d37aea9f1af2e2d096e4e04 Mon Sep 17 00:00:00 2001 From: Kakabay <2kakabayashyrberdyew@gmail.com> Date: Fri, 5 Apr 2024 10:19:00 +0500 Subject: [PATCH] phone changed --- .../ImmediateCreditsStages/AcceptStage.js | 162 +++++++------ .../ImmediateCreditsStages/PaymentSuccess.js | 129 +++++----- .../ImmediateCreditsStages/PhoneAccept.js | 226 ++++++++++-------- 3 files changed, 288 insertions(+), 229 deletions(-) diff --git a/src/components/ImmediateCreditsStages/AcceptStage.js b/src/components/ImmediateCreditsStages/AcceptStage.js index 4f45067..5fa364b 100644 --- a/src/components/ImmediateCreditsStages/AcceptStage.js +++ b/src/components/ImmediateCreditsStages/AcceptStage.js @@ -1,13 +1,13 @@ // IMPORT MODULES -import React, { useState, useContext } from 'react'; -import { LanguageContext } from '../../backend/LanguageContext'; -import { UserContext } from '../../backend/UserContext'; -import { useForm } from 'react-hook-form'; -import { z } from 'zod'; -import { zodResolver } from '@hookform/resolvers/zod'; +import React, { useState, useContext } from "react"; +import { LanguageContext } from "../../backend/LanguageContext"; +import { UserContext } from "../../backend/UserContext"; +import { useForm } from "react-hook-form"; +import { z } from "zod"; +import { zodResolver } from "@hookform/resolvers/zod"; // IMPORT IMAGES -import next from '../../icons/next.svg'; -import next_reverse from '../../icons/next-reverse.svg'; +import next from "../../icons/next.svg"; +import next_reverse from "../../icons/next-reverse.svg"; // import arrow from "../../icons/arrow.svg"; const schema = z.object({ @@ -30,7 +30,8 @@ const AcceptStage = ({ userDataRes, }) => { const { locale } = useContext(LanguageContext); - const userToken = localStorage.getItem('userToken'); + const userToken = localStorage.getItem("userToken"); + const { user } = useContext(UserContext); const handleCardDetails = (e) => { setCardDetails(e.target.value); @@ -46,20 +47,23 @@ const AcceptStage = ({ } = useForm({ resolver: zodResolver(schema), defaultValues: { - amount: recepientAmount ? recepientAmount : 'Loading', - duration: creditDuration ? creditDuration : 'loading', + amount: recepientAmount ? recepientAmount : "Loading", + duration: creditDuration ? creditDuration : "loading", }, }); const sendCode = async () => { try { - const response = await fetch('https://shahsyotag.halkbank.gov.tm/sendOTP', { - method: 'POST', - headers: { 'Content-Type': 'aplication/json' }, - body: JSON.stringify({ - phone_number: '+99361454210', - }), - }); + const response = await fetch( + "https://shahsyotag.halkbank.gov.tm/sendOTP", + { + method: "POST", + headers: { "Content-Type": "aplication/json" }, + body: JSON.stringify({ + phone_number: user.mobile_phone, + }), + } + ); if (!response.ok) { throw new Error(`HTTP error! Status: ${response.status}`); @@ -81,19 +85,23 @@ const AcceptStage = ({

Error...

- @@ -114,50 +122,55 @@ const AcceptStage = ({

- {locale === 'TKM' - ? 'Karzyň kalkulýatory' - : locale === 'РУС' - ? 'Подтвердите данные' - : locale === 'ENG' - ? 'Loan calculator' - : 'Karzyň kalkulýatory'} + {locale === "TKM" + ? "Karzyň kalkulýatory" + : locale === "РУС" + ? "Подтвердите данные" + : locale === "ENG" + ? "Loan calculator" + : "Karzyň kalkulýatory"}

- + {errors.amount && {errors.amount.message}}
- + {errors.duration && {errors.duration.message}}
- @@ -196,16 +213,17 @@ const AcceptStage = ({ onClick={() => { onSubmit(); setStage(9); - }}> + }} + >

- {locale === 'TKM' - ? 'Dowam et' - : locale === 'РУС' - ? 'Подтвердить ' - : locale === 'ENG' - ? 'Proceed' - : 'Dowam et'} + {locale === "TKM" + ? "Dowam et" + : locale === "РУС" + ? "Подтвердить " + : locale === "ENG" + ? "Proceed" + : "Dowam et"}

logout diff --git a/src/components/ImmediateCreditsStages/PaymentSuccess.js b/src/components/ImmediateCreditsStages/PaymentSuccess.js index 228f620..8927a26 100644 --- a/src/components/ImmediateCreditsStages/PaymentSuccess.js +++ b/src/components/ImmediateCreditsStages/PaymentSuccess.js @@ -1,9 +1,9 @@ -import React, { useContext, useState } from 'react'; -import { LanguageContext } from '../../backend/LanguageContext'; +import React, { useContext, useState } from "react"; +import { LanguageContext } from "../../backend/LanguageContext"; -import next from '../../icons/next.svg'; -import next_reverse from '../../icons/next-reverse.svg'; -import { UserContext } from '../../backend/UserContext'; +import next from "../../icons/next.svg"; +import next_reverse from "../../icons/next-reverse.svg"; +import { UserContext } from "../../backend/UserContext"; const PaymentSuccess = ({ setStage, @@ -18,7 +18,7 @@ const PaymentSuccess = ({ const { locale } = useContext(LanguageContext); const { user } = useContext(UserContext); - const [codeValue, setPhoneValue] = useState(''); + const [codeValue, setPhoneValue] = useState(""); const [isLoading, setIsLoading] = useState(false); const [error, setError] = useState(false); @@ -30,15 +30,18 @@ const PaymentSuccess = ({ const confirmCode = async () => { try { setIsLoading(true); - const response = await fetch('https://shahsyotag.halkbank.gov.tm/validateOTP', { - headers: { 'Content-Type': 'aplication/json' }, - method: 'POST', + const response = await fetch( + "https://shahsyotag.halkbank.gov.tm/validateOTP", + { + headers: { "Content-Type": "aplication/json" }, + method: "POST", - body: JSON.stringify({ - phone_number: '+99361454210', - otp: codeValue, - }), - }); + body: JSON.stringify({ + phone_number: user.mobile_phone, + otp: codeValue, + }), + } + ); if (!response.ok) { throw new Error(`HTTP error! Status: ${response.status}`); @@ -46,7 +49,7 @@ const PaymentSuccess = ({ const jsonedResponse = await response.json(); - if (jsonedResponse === 'OTP validated successfully') { + if (jsonedResponse === "OTP validated successfully") { fetchData(); setIsLoading(false); } @@ -58,9 +61,9 @@ const PaymentSuccess = ({ const response = await fetch( `https://shahsyotag.halkbank.gov.tm/onlineloancre-services/api/loancre`, { - method: 'POST', + method: "POST", headers: { - 'Content-Type': 'application/json', + "Content-Type": "application/json", }, body: JSON.stringify({ clientRecipient: { @@ -70,7 +73,7 @@ const PaymentSuccess = ({ name: borrowerData.name, surname: borrowerData.surname, availableAmount: borrowerData.availableAmount, - clientType: 'recipient', + clientType: "recipient", signRecipient: borrowerData.signRecipient, }, clientGuarantor: isGuranter @@ -81,7 +84,7 @@ const PaymentSuccess = ({ name: guaranterData.name, surname: guaranterData.surname, availableAmount: guaranterData.availableAmount, - clientType: 'guarantor', + clientType: "guarantor", signGuarantor: guaranterData.signGuarantor, } : null, @@ -90,7 +93,7 @@ const PaymentSuccess = ({ mrtIsInsuarance: isGuranter ? 0 : 1, termInYears: creditDuration, }), - }, + } ); if (!response.ok) { @@ -128,35 +131,40 @@ const PaymentSuccess = ({

- {locale === 'TKM' - ? 'Karzyň kalkulýatory' - : locale === 'РУС' - ? 'Оплата прошла успешно, ваша заявка на оформление кредитной карты принята' - : locale === 'ENG' - ? 'Loan calculator' - : 'Karzyň kalkulýatory'} + {locale === "TKM" + ? "Karzyň kalkulýatory" + : locale === "РУС" + ? "Оплата прошла успешно, ваша заявка на оформление кредитной карты принята" + : locale === "ENG" + ? "Loan calculator" + : "Karzyň kalkulýatory"}

- {locale === 'TKM' - ? 'Karzyň kalkulýatory' - : locale === 'РУС' - ? 'Завершите оформление онлайн кредита, введя СМС код, отправленный на ваш номер телефона ' - : locale === 'ENG' - ? 'Loan calculator' - : 'Karzyň kalkulýatory'} + {locale === "TKM" + ? "Karzyň kalkulýatory" + : locale === "РУС" + ? "Завершите оформление онлайн кредита, введя СМС код, отправленный на ваш номер телефона " + : locale === "ENG" + ? "Loan calculator" + : "Karzyň kalkulýatory"}

- + {/* Отправить код снова */} @@ -164,19 +172,23 @@ const PaymentSuccess = ({
- @@ -184,16 +196,17 @@ const PaymentSuccess = ({ disabled={codeValue.length !== 6 && !isLoading ? true : false} type="submit" onClick={onSubmit} - className="sign-btn cu-btn"> + className="sign-btn cu-btn" + >

- {locale === 'TKM' - ? 'Dowam et' - : locale === 'РУС' - ? 'Подтвердить ' - : locale === 'ENG' - ? 'Proceed' - : 'Dowam et'} + {locale === "TKM" + ? "Dowam et" + : locale === "РУС" + ? "Подтвердить " + : locale === "ENG" + ? "Proceed" + : "Dowam et"}

logout diff --git a/src/components/ImmediateCreditsStages/PhoneAccept.js b/src/components/ImmediateCreditsStages/PhoneAccept.js index e4befee..edd85af 100644 --- a/src/components/ImmediateCreditsStages/PhoneAccept.js +++ b/src/components/ImmediateCreditsStages/PhoneAccept.js @@ -1,13 +1,13 @@ // IMPORT MODULES -import React, { useState, useContext } from 'react'; -import { LanguageContext } from '../../backend/LanguageContext'; -import { useForm } from 'react-hook-form'; -import { z } from 'zod'; -import { zodResolver } from '@hookform/resolvers/zod'; +import React, { useState, useContext } from "react"; +import { LanguageContext } from "../../backend/LanguageContext"; +import { useForm } from "react-hook-form"; +import { z } from "zod"; +import { zodResolver } from "@hookform/resolvers/zod"; // IMPORT IMAGES -import next from '../../icons/next.svg'; -import next_reverse from '../../icons/next-reverse.svg'; -import { UserContext } from '../../backend/UserContext'; +import next from "../../icons/next.svg"; +import next_reverse from "../../icons/next-reverse.svg"; +import { UserContext } from "../../backend/UserContext"; // import arrow from "../../icons/arrow.svg"; const schema = z.object({ @@ -30,7 +30,7 @@ const PhoneAccept = ({ }) => { const { locale } = useContext(LanguageContext); const { user } = useContext(UserContext); - const userToken = localStorage.getItem('userToken'); + const userToken = localStorage.getItem("userToken"); const [isLoading, setIsLoading] = useState(false); const [error, setError] = useState(false); @@ -38,7 +38,7 @@ const PhoneAccept = ({ const [invalidData, setInvalidData] = useState(false); const [tryAgain, setTryAgain] = useState(false); - const [codeValue, setPhoneValue] = useState(''); + const [codeValue, setPhoneValue] = useState(""); const [errMesage, setErrMessage] = useState(); @@ -53,23 +53,26 @@ const PhoneAccept = ({ const confirmPayment = async () => { try { const headers = { - 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8', + "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8", }; const formData = new URLSearchParams(); - formData.append('app', 'sanlykarz'); - formData.append('id', borrowerData.idNo); - formData.append('md-order', paymentDetails['md-order']); - formData.append('acs-req-id', submitCardDetails['acs-request-id']); - formData.append('acs-session-url', submitCardDetails['acs-session-url']); - formData.append('otp', codeValue); - formData.append('term-url', submitCardDetails['terminate-url']); + formData.append("app", "sanlykarz"); + formData.append("id", borrowerData.idNo); + formData.append("md-order", paymentDetails["md-order"]); + formData.append("acs-req-id", submitCardDetails["acs-request-id"]); + formData.append("acs-session-url", submitCardDetails["acs-session-url"]); + formData.append("otp", codeValue); + formData.append("term-url", submitCardDetails["terminate-url"]); - const response = await fetch('https://shahsyotag.halkbank.gov.tm/api/v1/confirm-payment', { - method: 'POST', - headers: headers, - body: formData.toString(), - }); + const response = await fetch( + "https://shahsyotag.halkbank.gov.tm/api/v1/confirm-payment", + { + method: "POST", + headers: headers, + body: formData.toString(), + } + ); const jsonedResponse = await response.json(); @@ -77,13 +80,16 @@ const PhoneAccept = ({ throw new Error(`HTTP error! Status: ${response.status}`); } - if (jsonedResponse.status === 'ok' && jsonedResponse['final-url'].includes('status=1')) { - console.log(jsonedResponse['final-url']); + if ( + jsonedResponse.status === "ok" && + jsonedResponse["final-url"].includes("status=1") + ) { + console.log(jsonedResponse["final-url"]); setInvalidData(false); checkPayment(); } else if ( - jsonedResponse.status === 'wrong-otp' || - !jsonedResponse['final-url'].includes('status=1') + jsonedResponse.status === "wrong-otp" || + !jsonedResponse["final-url"].includes("status=1") ) { setTryAgain(true); } else { @@ -95,7 +101,7 @@ const PhoneAccept = ({ const checkPayment = async () => { try { const response = await fetch( - `https://shahsyotag.halkbank.gov.tm/app/api/check-payment-credit-card?paymentId=${paymentLink.id}&orderId=${paymentDetails['md-order']}&status=1`, + `https://shahsyotag.halkbank.gov.tm/app/api/check-payment-credit-card?paymentId=${paymentLink.id}&orderId=${paymentDetails["md-order"]}&status=1` ); if (!response.ok) { @@ -104,8 +110,8 @@ const PhoneAccept = ({ const jsonedResponse = await response.json(); - if (jsonedResponse.status.ErrorCode === '0') { - console.log('success'); + if (jsonedResponse.status.ErrorCode === "0") { + console.log("success"); sendCode(); } @@ -115,16 +121,19 @@ const PhoneAccept = ({ }; const sendCode = async () => { - console.log('startred'); + console.log("startred"); try { - const response = await fetch('https://shahsyotag.halkbank.gov.tm/sendOTP', { - method: 'POST', - headers: { 'Content-Type': 'aplication/json' }, - body: JSON.stringify({ - phone_number: '+99361454210', - }), - }); + const response = await fetch( + "https://shahsyotag.halkbank.gov.tm/sendOTP", + { + method: "POST", + headers: { "Content-Type": "aplication/json" }, + body: JSON.stringify({ + phone_number: user.mobile_phone, + }), + } + ); if (!response.ok) { throw new Error(`HTTP error! Status: ${response.status}`); @@ -139,19 +148,22 @@ const PhoneAccept = ({ const confirmCode = async () => { try { setIsLoading(true); - const response = await fetch('https://shahsyotag.halkbank.gov.tm/validateOTP', { - headers: { 'Content-Type': 'aplication/json' }, - method: 'POST', + const response = await fetch( + "https://shahsyotag.halkbank.gov.tm/validateOTP", + { + headers: { "Content-Type": "aplication/json" }, + method: "POST", - body: JSON.stringify({ - phone_number: '+99361454210', - otp: codeValue, - }), - }); + body: JSON.stringify({ + phone_number: user.mobile_phone, + otp: codeValue, + }), + } + ); const jsonedResponse = await response.json(); - if (jsonedResponse === 'OTP validated successfully') { + if (jsonedResponse === "OTP validated successfully") { fetchData(); } else { setErrMessage(true); @@ -164,9 +176,9 @@ const PhoneAccept = ({ const response = await fetch( `https://shahsyotag.halkbank.gov.tm/onlineloancre-services/api/loancre`, { - method: 'POST', + method: "POST", headers: { - 'Content-Type': 'application/json', + "Content-Type": "application/json", }, body: JSON.stringify({ clientRecipient: { @@ -176,7 +188,7 @@ const PhoneAccept = ({ name: borrowerData.name, surname: borrowerData.surname, availableAmount: borrowerData.availableAmount, - clientType: 'recipient', + clientType: "recipient", signRecipient: borrowerData.signRecipient, }, clientGuarantor: isGuranter @@ -187,7 +199,7 @@ const PhoneAccept = ({ name: guaranterData.name, surname: guaranterData.surname, availableAmount: guaranterData.availableAmount, - clientType: 'guarantor', + clientType: "guarantor", signGuarantor: guaranterData.signGuarantor, } : null, @@ -196,7 +208,7 @@ const PhoneAccept = ({ mrtIsInsuarance: isGuranter ? 0 : 1, termInYears: creditDuration, }), - }, + } ); if (!response.ok) { @@ -221,15 +233,18 @@ const PhoneAccept = ({ const sendData = async (requestBody) => { try { const headers = { - Accept: 'application/json', - 'Content-Type': 'application/json', + Accept: "application/json", + "Content-Type": "application/json", Authorization: `Bearer ${userToken}`, }; - const response = await fetch('https://shahsyotag.halkbank.gov.tm/app/api/quick_loans', { - method: 'POST', - headers: headers, - body: JSON.stringify(requestBody.sign), - }); + const response = await fetch( + "https://shahsyotag.halkbank.gov.tm/app/api/quick_loans", + { + method: "POST", + headers: headers, + body: JSON.stringify(requestBody.sign), + } + ); const jsonedResponse = await response.json(); if (!cardDetails) { @@ -265,19 +280,23 @@ const PhoneAccept = ({ return (

Error...

- @@ -289,27 +308,34 @@ const PhoneAccept = ({

- {locale === 'TKM' - ? 'Karzyň kalkulýatory' - : locale === 'РУС' - ? 'Введите код с СМС оповещения, отправленный на номер ' - : locale === 'ENG' - ? 'Loan calculator' - : 'Karzyň kalkulýatory'} - {cardDetails ? '+99361454210' : submitCardDetails['three-d-secure-number']} + {locale === "TKM" + ? "Karzyň kalkulýatory" + : locale === "РУС" + ? "Введите код с СМС оповещения, отправленный на номер " + : locale === "ENG" + ? "Loan calculator" + : "Karzyň kalkulýatory"} + {cardDetails + ? user.mobile_phone + : submitCardDetails["three-d-secure-number"]}

- + {/* Отправить код снова */} @@ -330,19 +356,20 @@ const PhoneAccept = ({ @@ -358,16 +385,17 @@ const PhoneAccept = ({ } type="submit" onClick={onSubmit} - className="sign-btn cu-btn"> + className="sign-btn cu-btn" + >

- {locale === 'TKM' - ? 'Dowam et' - : locale === 'РУС' - ? 'Подтвердить ' - : locale === 'ENG' - ? 'Proceed' - : 'Dowam et'} + {locale === "TKM" + ? "Dowam et" + : locale === "РУС" + ? "Подтвердить " + : locale === "ENG" + ? "Proceed" + : "Dowam et"}

logout