diff --git a/src/components/ImmediateCreditsStages/AcceptStage.js b/src/components/ImmediateCreditsStages/AcceptStage.js index 0104f64..7d360f0 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({ @@ -28,9 +28,12 @@ const AcceptStage = ({ setAcceptedMessage, setUserDataRes, userDataRes, + setErrMessage, + setErrMessageEn, + setErrMessageTkm, }) => { const { locale } = useContext(LanguageContext); - const userToken = localStorage.getItem('userToken'); + const userToken = localStorage.getItem("userToken"); const { user } = useContext(UserContext); const handleCardDetails = (e) => { @@ -47,20 +50,20 @@ const AcceptStage = ({ } = useForm({ resolver: zodResolver(schema), defaultValues: { - amount: recepientAmount ? recepientAmount : 'Loading', - duration: creditDuration ? creditDuration : 'loading', + amount: recepientAmount ? recepientAmount : "Loading", + duration: creditDuration ? creditDuration : "loading", }, }); const loanCreateCheck = async () => { try { const response = await fetch( - 'https://shahsyotag.halkbank.gov.tm/onlineloancre-services/api/loancre/check', + "https://shahsyotag.halkbank.gov.tm/onlineloancre-services/api/loancre/check", { - method: 'POST', + method: "POST", headers: { - Accept: 'application/json, text/plain', - 'Content-Type': 'application/json;charset=UTF-8', + Accept: "application/json, text/plain", + "Content-Type": "application/json;charset=UTF-8", }, body: JSON.stringify({ clientRecipient: { @@ -70,7 +73,7 @@ const AcceptStage = ({ name: borrowerData.name, surname: borrowerData.surname, availableAmount: borrowerData.availableAmount, - clientType: 'recipient', + clientType: "recipient", signRecipient: borrowerData.signRecipient, }, clientGuarantor: isGuranter @@ -81,7 +84,7 @@ const AcceptStage = ({ name: guaranterData.name, surname: guaranterData.surname, availableAmount: guaranterData.availableAmount, - clientType: 'guarantor', + clientType: "guarantor", signGuarantor: guaranterData.signGuarantor, } : null, @@ -90,7 +93,7 @@ const AcceptStage = ({ mrtIsInsuarance: isGuranter ? 0 : 1, termInYears: creditDuration, }), - }, + } ); if (!response.ok) { @@ -99,11 +102,12 @@ const AcceptStage = ({ const jsonedResponse = await response.json(); - console.log(jsonedResponse); - if (jsonedResponse.errCode === 0) { sendCode(); } else { + setErrMessage(jsonedResponse.messageRu); + setErrMessageTkm(jsonedResponse.message); + setErrMessageEn(jsonedResponse.messageEn); setStage(10); } } catch (error) {} @@ -111,13 +115,16 @@ const AcceptStage = ({ 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: user.mobile_phone, - }), - }); + 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}`); @@ -138,19 +145,23 @@ const AcceptStage = ({

Error...

- @@ -163,13 +174,13 @@ const AcceptStage = ({ return (

- {locale === 'TKM' - ? 'Garaşmagyňyzy haýyş edýäris ...' - : locale === 'РУС' - ? 'Пожалуйста, подождите...' - : locale === 'ENG' - ? 'Please wait...' - : 'Garaşmagyňyzy haýyş edýäris ...'} + {locale === "TKM" + ? "Garaşmagyňyzy haýyş edýäris ..." + : locale === "РУС" + ? "Пожалуйста, подождите..." + : locale === "ENG" + ? "Please wait..." + : "Garaşmagyňyzy haýyş edýäris ..."}

); @@ -179,50 +190,55 @@ const AcceptStage = ({

- {locale === 'TKM' - ? 'Karzyň maglumatlaryny tassyklaň' - : locale === 'РУС' - ? 'Подтвердите данные кредита' - : locale === 'ENG' - ? 'Confirm the loan details' - : 'Karzyň maglumatlaryny tassyklaň'} + {locale === "TKM" + ? "Karzyň maglumatlaryny tassyklaň" + : locale === "РУС" + ? "Подтвердите данные кредита" + : locale === "ENG" + ? "Confirm the loan details" + : "Karzyň maglumatlaryny tassyklaň"}

- + {errors.amount && {errors.amount.message}}
- + {errors.duration && {errors.duration.message}}
setStage(12)}> - {locale === 'TKM' - ? 'Kartyňyz ýok bolsa, täze karty üçin ýüz tutuň' - : locale === 'РУС' - ? 'Оформите новую карту, если она у вас отсувствует' - : locale === 'ENG' - ? 'Apply for a new card if you do not have one' - : 'Kartyňyz ýok bolsa, täze karty üçin ýüz tutuň'} + {locale === "TKM" + ? "Kartyňyz ýok bolsa, täze karty üçin ýüz tutuň" + : locale === "РУС" + ? "Оформите новую карту, если она у вас отсувствует" + : locale === "ENG" + ? "Apply for a new card if you do not have one" + : "Kartyňyz ýok bolsa, täze karty üçin ýüz tutuň"} {/* {errors.code && {errors.code.message}} */}
- @@ -266,16 +286,17 @@ const AcceptStage = ({ disabled={cardDetails.length !== 23 && !isLoading ? true : false} onClick={() => { onSubmit(); - }}> + }} + >

- {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/immediateCredits/ImmediateCreditModal.js b/src/components/immediateCredits/ImmediateCreditModal.js index 29f3d49..7df92aa 100644 --- a/src/components/immediateCredits/ImmediateCreditModal.js +++ b/src/components/immediateCredits/ImmediateCreditModal.js @@ -487,9 +487,11 @@ const ImmediateCreditModal = ({ borrowerData={borrowerData} guaranterData={guaranterData} isGuranter={isGuranter} - setErrMessage={setErrMessage} setUserDataRes={setUserDataRes} userDataRes={userDataRes} + setErrMessage={setErrMessage} + setErrMessageEn={setErrMessageEn} + setErrMessageTkm={setErrMessageTkm} /> ) : stage === 9 ? ( ) : stage === 11 ? (