react-native-timacare 3.1.13-beta → 3.1.14-beta

package/src/screens/toan-trinh-so/ReviewInformationOther.tsx

@@ -22,7 +22,11 @@ import { ScreenNames } from '../../navigation';
 import KeyboardSpacer from '../../components/keyboardspace';
 import MButton from '../../components/MButton';
 import LinearGradient from 'react-native-linear-gradient';
-import { formatMoney } from '../../utils';
+import {
+  EnumRelationshipOption1,
+  EnumRelationshipOption2,
+  formatMoney,
+} from '../../utils';
 import { Api } from '../../services/api';
 import Loading from '../../components/Loading';
 import * as yup from 'yup';
@@ -115,7 +119,7 @@ export default function ReviewInformationOther(props) {
           }
 
           if (response.data?.data?.listRelationships[0]?.relationshipType) {
-            let r = ttsStore.listRelationship.find(
+            let r = EnumRelationshipOption1.find(
               (x) =>
                 x.id ===
                 response.data?.data?.listRelationships[0]?.relationshipType
@@ -123,7 +127,7 @@ export default function ReviewInformationOther(props) {
             formRef.current.setFieldValue('relationshipType1', r);
           }
           if (response.data?.data?.listRelationships[1]?.relationshipType) {
-            let r = ttsStore.listRelationship.find(
+            let r = EnumRelationshipOption2.find(
               (x) =>
                 x.id ===
                 response.data?.data?.listRelationships[1]?.relationshipType
@@ -145,59 +149,74 @@ export default function ReviewInformationOther(props) {
   }, []);
 
   const onSubmit = async (values) => {
-    try {
-      setIsLoading(true);
-      const body = {
-        loanBriefId: props.route?.params?.loan?.id,
-        jobId: values.jobId,
-        totalIncome: Number(values.totalIncome),
-        companyName: values.companyName,
-        description: values.description,
-        provinceId: values.provinceId,
-        districtId: values.districtId,
-        wardId: values.wardId,
-        address: values?.address,
-        listRelationships: [
-          {
-            relationshipType: values.relationshipType1?.id,
-            fullName: values.fullName1,
-            phone: values.phone1,
-          },
-          {
-            relationshipType: values.relationshipType2?.id,
-            fullName: values.fullName2,
-            phone: values.phone2,
-          },
-        ],
-      };
+    Alert.alert(
+      'Thông báo',
+      'Bạn có chắc chắn muốn cập nhật thông tin này không?',
+      [
+        {
+          text: 'Hủy',
+          style: 'cancel',
+        },
+        {
+          text: 'Đồng ý',
+          onPress: async () => {
+            try {
+              setIsLoading(true);
+              const body = {
+                loanBriefId: props.route?.params?.loan?.id,
+                jobId: values.jobId,
+                totalIncome: Number(values.totalIncome),
+                companyName: values.companyName,
+                description: values.description,
+                provinceId: values.provinceId,
+                districtId: values.districtId,
+                wardId: values.wardId,
+                address: values?.address,
+                listRelationships: [
+                  {
+                    relationshipType: values.relationshipType1?.id,
+                    fullName: values.fullName1,
+                    phone: values.phone1,
+                  },
+                  {
+                    relationshipType: values.relationshipType2?.id,
+                    fullName: values.fullName2,
+                    phone: values.phone2,
+                  },
+                ],
+              };
 
-      const response = await Api.getInstance().updateInfoJob(body);
-      setIsLoading(false);
-      if (response.kind === 'ok') {
-        if (response.data?.meta?.errorCode === 200) {
-          Alert.alert('Thông báo', 'Cập nhật thông tin thành công', [
-            {
-              text: 'Đồng ý',
-              onPress: () => {
-                navigation.dispatch(
-                  CommonActions.reset({
-                    index: 1,
-                    routes: [{ name: ScreenNames.Main }],
-                  })
-                );
-              },
-            },
-          ]);
-        } else {
-          Alert.alert('Thông báo', response.data?.meta?.errorMessage);
-        }
-      } else {
-        Alert.alert('Thông báo', 'Có lỗi xảy ra. Vui lòng thử lại sau');
-      }
-    } catch (error) {
-      setIsLoading(false);
-      console.log(error);
-    }
+              const response = await Api.getInstance().updateInfoJob(body);
+              setIsLoading(false);
+              if (response.kind === 'ok') {
+                if (response.data?.meta?.errorCode === 200) {
+                  Alert.alert('Thông báo', 'Cập nhật thông tin thành công', [
+                    {
+                      text: 'Đồng ý',
+                      onPress: () => {
+                        navigation.dispatch(
+                          CommonActions.reset({
+                            index: 1,
+                            routes: [{ name: ScreenNames.Main }],
+                          })
+                        );
+                      },
+                    },
+                  ]);
+                } else {
+                  Alert.alert('Thông báo', response.data?.meta?.errorMessage);
+                }
+              } else {
+                Alert.alert('Thông báo', 'Có lỗi xảy ra. Vui lòng thử lại sau');
+              }
+            } catch (error) {
+              setIsLoading(false);
+              console.log(error);
+            }
+          },
+        },
+      ]
+    );
   };
 
   return (
@@ -535,7 +554,7 @@ export default function ReviewInformationOther(props) {
                       onPress={() => {
                         navigation.push(ScreenNames.MSelect, {
                           title: 'Mối quan hệ',
-                          data: ttsStore.listRelationship,
+                          data: EnumRelationshipOption1,
                           callback: (item) => {
                             setFieldValue('relationshipType1', item);
                           },
@@ -626,7 +645,7 @@ export default function ReviewInformationOther(props) {
                       onPress={() => {
                         navigation.push(ScreenNames.MSelect, {
                           title: 'Mối quan hệ',
-                          data: ttsStore.listRelationship,
+                          data: EnumRelationshipOption2,
                           callback: (item) => {
                             setFieldValue('relationshipType2', item);
                           },

package/src/screens/toan-trinh-so/ReviewLoan.tsx

@@ -50,6 +50,9 @@ export default function ReviewLoan(props: any) {
         loanAmount: Number(values.loanAmount),
         rateTypeId: values.rateTypeId,
         loanTime: values.loanTime,
+        firstPaymentDate: moment(values.firstPaymentDate, 'DD/MM/YYYY').format(
+          'YYYY-MM-DD'
+        ),
         buyInsurenceCustomer: values?.buyInsurenceCustomer,
         buyInsuranceProperty: values?.buyInsuranceProperty,
         timeInsurenceCustomer: values?.timeInsurenceCustomer?.id,
@@ -119,6 +122,10 @@ export default function ReviewLoan(props: any) {
             'loanAmount',
             response?.data?.data?.loanAmount ?? 0
           );
+          formRef.current.setFieldValue(
+            'firstPaymentDate',
+            formatDDMMYYY(response?.data?.data?.firstPaymentDate) ?? ''
+          );
           formRef.current.setFieldValue(
             'rateTypeId',
             response?.data?.data?.rateTypeId ?? null
@@ -229,7 +236,7 @@ export default function ReviewLoan(props: any) {
   useEffect(() => {
     getData();
     ttsStore.getListBrand();
-    ttsStore.getRelationship();
+    ttsStore.getFirstPayment(props.route?.params?.loan?.id);
   }, []);
 
   const getInfoInsurence = async (
@@ -323,6 +330,7 @@ export default function ReviewLoan(props: any) {
               loanAmount: '',
               rateTypeId: null,
               loanTime: null,
+              firstPaymentDate: '',
               buyInsurenceCustomer: false,
               buyInsuranceProperty: false,
               timeInsurenceCustomer: null,
@@ -349,6 +357,7 @@ export default function ReviewLoan(props: any) {
               loanAmount: yup.string().required('Số tiền là bắt buộc'),
               rateTypeId: yup.number().required('Vui lòng chọn').nullable(),
               loanTime: yup.number().required('Vui lòng chọn').nullable(),
+              firstPaymentDate: yup.string().required('Vui lòng chọn'),
               bankName: yup.string().required('Vui lòng chọn ngân hàng'),
               bankAccountName: yup.string().required('Vui lòng nhập chủ thẻ'),
               bankAccountNumber: yup
@@ -494,6 +503,39 @@ export default function ReviewLoan(props: any) {
                   <MText style={$error}>{errors.loanTime}</MText>
                 )}
 
+                <MText style={[$label, { marginTop: 16 }]}>
+                  Ngày thanh toán kỳ đầu
+                </MText>
+                <TouchableOpacity
+                  style={$select}
+                  onPress={() => {
+                    navigation.push(ScreenNames.MSelect, {
+                      title: 'Ngày thanh toán kỳ đầu',
+                      data: ttsStore.listFirstPayment,
+                      callback: (value) => {
+                        setFieldValue('firstPaymentDate', value?.name);
+                      },
+                    });
+                  }}
+                >
+                  <MText
+                    numberOfLines={1}
+                    style={{
+                      color: '#333333',
+                      fontSize: 16,
+                      fontWeight: '500',
+                      flex: 1,
+                      fontFamily: 'Be Vietnam Pro Medium',
+                    }}
+                  >
+                    {values?.firstPaymentDate}
+                  </MText>
+                  <DropDown2 />
+                </TouchableOpacity>
+                {errors && errors.firstPaymentDate && (
+                  <MText style={$error}>{errors.firstPaymentDate}</MText>
+                )}
+
                 <View
                   style={{
                     backgroundColor: '#FFF8F2',
@@ -758,7 +800,9 @@ export default function ReviewLoan(props: any) {
                 {errors && errors.bankName && (
                   <MText style={$error}>{errors.bankName}</MText>
                 )}
-                <MText style={[$label, { marginTop: 16 }]}>Tên chủ thẻ</MText>
+                <MText style={[$label, { marginTop: 16 }]}>
+                  Tên số tài khoản
+                </MText>
                 <TextInput
                   numberOfLines={1}
                   style={[
@@ -899,7 +943,7 @@ export default function ReviewLoan(props: any) {
                   <MText style={$error}>{errors.vehicles}</MText>
                 )}
 
-                <MText style={[$label, { marginTop: 16 }]}>Biển số xe</MText>
+                <MText style={[$label, { marginTop: 16 }]}>Số khung</MText>
                 <TextInput
                   numberOfLines={1}
                   style={[
@@ -910,16 +954,16 @@ export default function ReviewLoan(props: any) {
                       fontWeight: '500',
                     },
                   ]}
-                  value={values.plateNumber}
-                  onChangeText={handleChange('plateNumber')}
+                  value={values.chassis}
+                  onChangeText={handleChange('chassis')}
                 />
-                {errors && errors.plateNumber && (
-                  <MText style={$error}>{errors.plateNumber}</MText>
+                {errors && errors.chassis && (
+                  <MText style={$error}>{errors.chassis}</MText>
                 )}
 
                 <View style={[$row, { marginTop: 16 }]}>
                   <View style={{ flex: 1 }}>
-                    <MText style={$label}>Số khung</MText>
+                    <MText style={$label}>Biển số xe</MText>
                     <TextInput
                       numberOfLines={1}
                       style={[
@@ -930,11 +974,11 @@ export default function ReviewLoan(props: any) {
                           fontWeight: '500',
                         },
                       ]}
-                      value={values.chassis}
-                      onChangeText={handleChange('chassis')}
+                      value={values.plateNumber}
+                      onChangeText={handleChange('plateNumber')}
                     />
-                    {errors && errors.chassis && (
-                      <MText style={$error}>{errors.chassis}</MText>
+                    {errors && errors.plateNumber && (
+                      <MText style={$error}>{errors.plateNumber}</MText>
                     )}
                   </View>
                   <View style={{ flex: 1 }}>
@@ -1010,6 +1054,8 @@ export default function ReviewLoan(props: any) {
                           fontWeight: '500',
                         },
                       ]}
+                      placeholder="DD/MM/YYYY"
+                      placeholderTextColor="#BDBDBD"
                       value={values.motobikeCertificateDate}
                       onChangeText={handleChange('motobikeCertificateDate')}
                     />

package/src/screens/toan-trinh-so/TTSOTP.tsx

@@ -22,6 +22,7 @@ import {
 import { Api } from '../../services/api';
 import Loading from '../../components/Loading';
 import { ScreenNames } from '../../navigation';
+import { CommonActions, useNavigation } from '@react-navigation/native';
 
 const logoView: ImageStyle = {
   position: 'absolute',
@@ -30,7 +31,8 @@ const logoView: ImageStyle = {
   resizeMode: 'cover',
 };
 
-export default function TTSOTP({ navigation, route }: any) {
+export default function TTSOTP({ route }: any) {
+  const navigation = useNavigation();
   const loan = route?.params?.loan;
   const [description, setDescription] = useState(
     'Vui lòng click “Gửi mã OTP” để nhận mã xác thực được gửi vào số điện thoại của bạn'
@@ -66,6 +68,7 @@ export default function TTSOTP({ navigation, route }: any) {
     const response = await Api.getInstance().signContractForBorrower({
       loanBriefId: loan.id,
     });
+
     setIsLoading(false);
     if (response.kind === 'ok' && response.data.meta.errorCode === 200) {
       setTimeLeft(300);
@@ -74,9 +77,7 @@ export default function TTSOTP({ navigation, route }: any) {
       );
       setIsCounting(true);
     } else {
-      Alert.alert('Thông báo', response.data.meta.errorMessage, [
-        { text: 'Đồng ý' },
-      ]);
+      Alert.alert('Thông báo', response.data.meta.errorMessage);
       setValue('');
     }
   };
@@ -136,9 +137,7 @@ export default function TTSOTP({ navigation, route }: any) {
         setValue('');
       }
     } else {
-      Alert.alert('Thông báo', 'Vui lòng nhập đầy đủ mã OTP gồm 6 chữ số.', [
-        { text: 'Đồng ý' },
-      ]);
+      Alert.alert('Thông báo', 'Vui lòng nhập đầy đủ mã OTP gồm 6 chữ số.');
       setValue('');
     }
   };

package/src/screens/toan-trinh-so/TTSSignLoan.tsx

@@ -1,17 +1,59 @@
 //@ts-nocheck
-import React from 'react';
-import { SafeAreaView, ScrollView, TouchableOpacity, View } from 'react-native';
+import React, { useEffect } from 'react';
+import {
+  Alert,
+  SafeAreaView,
+  ScrollView,
+  TouchableOpacity,
+  View,
+} from 'react-native';
 import { MText } from '../../components/MText';
-import { CheckBoxActive, IconBack } from '../../assets/icons';
+import { CheckBox, CheckBoxActive, IconBack } from '../../assets/icons';
 import LinearGradient from 'react-native-linear-gradient';
 import { CommonActions, useNavigation } from '@react-navigation/native';
 import { ScreenNames } from '../../navigation';
 import Pdf from 'react-native-pdf';
+import { Api } from '../../services/api';
+import { is, set } from 'ramda';
+import Loading from '../../components/Loading';
 
 export default function TTSSignLoan(props) {
   const loan = props?.route?.params?.loan;
+  const [isLoading, setIsLoading] = React.useState(false);
+  const [contract, setContract] = React.useState(null);
+  const [step, setStep] = React.useState(1);
+  const [isAgree, setIsAgree] = React.useState(false);
   const navigation = useNavigation();
 
+  const getContract = async () => {
+    try {
+      setIsLoading(true);
+      const response = await Api.getInstance().previewContract(loan?.id);
+      setIsLoading(false);
+      if (response.kind === 'ok') {
+        if (response.data?.meta?.errorCode === 200) {
+          setContract(response.data?.data);
+        } else {
+          Alert.alert(
+            'Thông báo',
+            response.data?.meta?.errorMessage ||
+              'Có lỗi xảy ra. Vui lòng thử lại sau.'
+          );
+        }
+      } else {
+        Alert.alert('Thông báo', 'Có lỗi xảy ra. Vui lòng thử lại sau.');
+      }
+    } catch (error) {
+      setIsLoading(false);
+    }
+  };
+
+  useEffect(() => {
+    if (loan) {
+      getContract();
+    }
+  }, []);
+
   return (
     <View
       style={{
@@ -34,7 +76,12 @@ export default function TTSSignLoan(props) {
         >
           <TouchableOpacity
             onPress={() => {
-              navigation.goBack();
+              navigation.dispatch(
+                CommonActions.reset({
+                  index: 1,
+                  routes: [{ name: ScreenNames.Main }],
+                })
+              );
             }}
             style={{
               position: 'absolute',
@@ -61,26 +108,52 @@ export default function TTSSignLoan(props) {
         </View>
 
         <View style={{ flex: 1 }}>
-          <Pdf
-            source={{
-              uri: 'https://file.tima.vn/uploads/ESignContract/9506778/HD-9506778_borrower_d0a70791-e213-4a83-b760-089df216afa4.pdf',
-            }}
-            onLoadComplete={(numberOfPages, filePath) => {
-              console.log(`Number of pages: ${numberOfPages}`);
-            }}
-            onPageChanged={(page, numberOfPages) => {
-              console.log(`Current page: ${page}`);
-            }}
-            onError={(error) => {
-              console.log(error);
-            }}
-            onPressLink={(uri) => {
-              console.log(`Link pressed: ${uri}`);
-            }}
-            style={{
-              flex: 1,
-            }}
-          />
+          {step === 1 ? (
+            <Pdf
+              source={{
+                uri:
+                  'data:application/pdf;base64,' +
+                  contract?.base64_hopdongdichvu,
+              }}
+              onLoadComplete={(numberOfPages, filePath) => {
+                console.log(`Number of pages: ${numberOfPages}`);
+              }}
+              onPageChanged={(page, numberOfPages) => {
+                console.log(`Current page: ${page}`);
+              }}
+              onError={(error) => {
+                console.log(error);
+              }}
+              onPressLink={(uri) => {
+                console.log(`Link pressed: ${uri}`);
+              }}
+              style={{
+                flex: 1,
+              }}
+            />
+          ) : (
+            <Pdf
+              source={{
+                uri:
+                  'data:application/pdf;base64,' + contract?.base64_giaoket_1,
+              }}
+              onLoadComplete={(numberOfPages, filePath) => {
+                console.log(`Number of pages: ${numberOfPages}`);
+              }}
+              onPageChanged={(page, numberOfPages) => {
+                console.log(`Current page: ${page}`);
+              }}
+              onError={(error) => {
+                console.log(error);
+              }}
+              onPressLink={(uri) => {
+                console.log(`Link pressed: ${uri}`);
+              }}
+              style={{
+                flex: 1,
+              }}
+            />
+          )}
         </View>
 
         <View
@@ -90,54 +163,116 @@ export default function TTSSignLoan(props) {
             paddingVertical: 16,
           }}
         >
+          {step === 2 && (
+            <View
+              style={{
+                flexDirection: 'row',
+                gap: 10,
+                paddingHorizontal: 16,
+              }}
+            >
+              <TouchableOpacity onPress={() => setIsAgree(!isAgree)}>
+                {isAgree ? <CheckBoxActive /> : <CheckBox />}
+              </TouchableOpacity>
+              <MText
+                style={{
+                  color: '#333333',
+                }}
+              >
+                Tôi đồng ý với tất cả những điều kiện trong hợp đồng.
+              </MText>
+            </View>
+          )}
           <View
             style={{
               flexDirection: 'row',
-              gap: 10,
-              paddingHorizontal: 16,
+              gap: 6,
+              marginTop: 16,
+              marginHorizontal: 16,
             }}
           >
-            <CheckBoxActive />
-            <MText
+            <View
               style={{
-                color: '#333333',
+                height: 4,
+                backgroundColor: step === 1 ? '#FF7A00' : '#FFEAD8',
+                flex: 1,
+                borderRadius: 6,
               }}
-            >
-              Tôi đồng ý với tất cả những điều kiện trong hợp đồng.
-            </MText>
+            />
+            <View
+              style={{
+                height: 4,
+                backgroundColor: step === 2 ? '#FF7A00' : '#F2F2F2',
+                flex: 1,
+                borderRadius: 6,
+              }}
+            />
           </View>
-          <TouchableOpacity
-            onPress={() => {
-              navigation.push(ScreenNames.TTSOTP, { loan });
-            }}
-            style={{
-              marginTop: 24,
-              marginHorizontal: 16,
-            }}
-          >
-            <LinearGradient
-              start={{ x: 1, y: 0 }}
-              end={{ x: 0, y: 1 }}
+          {step === 1 ? (
+            <TouchableOpacity
+              onPress={() => setStep(2)}
               style={{
                 height: 40,
-                borderRadius: 6,
                 alignItems: 'center',
                 justifyContent: 'center',
+                borderWidth: 1,
+                borderColor: '#FF7A00',
+                marginHorizontal: 16,
+                borderRadius: 6,
+                marginTop: 10,
               }}
-              colors={['#FF7A00', '#EF4123']}
             >
               <MText
                 style={{
-                  color: 'white',
+                  color: '#FF7A00',
                   fontSize: 16,
                 }}
               >
-                Xác nhận ký
+                Tiếp tục
               </MText>
-            </LinearGradient>
-          </TouchableOpacity>
+            </TouchableOpacity>
+          ) : (
+            <TouchableOpacity
+              onPress={() => {
+                if (!isAgree) {
+                  Alert.alert(
+                    'Thông báo',
+                    'Bạn cần đồng ý với tất cả những điều kiện trong hợp đồng trước khi ký.'
+                  );
+                  return;
+                }
+                navigation.push(ScreenNames.TTSOTP, { loan });
+              }}
+              style={{
+                marginTop: 10,
+                marginHorizontal: 16,
+              }}
+            >
+              <LinearGradient
+                start={{ x: 1, y: 0 }}
+                end={{ x: 0, y: 1 }}
+                style={{
+                  height: 40,
+                  borderRadius: 6,
+                  alignItems: 'center',
+                  justifyContent: 'center',
+                }}
+                colors={['#FF7A00', '#EF4123']}
+              >
+                <MText
+                  style={{
+                    color: 'white',
+                    fontSize: 16,
+                  }}
+                >
+                  Xác nhận ký
+                </MText>
+              </LinearGradient>
+            </TouchableOpacity>
+          )}
         </View>
       </SafeAreaView>
+      <Loading isLoading={isLoading} />
     </View>
   );
 }

package/src/screens/toan-trinh-so/VehicleCamera.tsx

@@ -52,7 +52,7 @@ export default function VehicleCamera(props: any) {
   const takePhoto = async () => {
     setTaking(true);
     const options = {
-      width: 720,
+      // width: 720,
       base64: true,
       pauseAfterCapture: true,
       fixOrientation: false,
@@ -228,6 +228,8 @@ export default function VehicleCamera(props: any) {
               buttonPositive: 'Ok',
               buttonNegative: 'Cancel',
             }}
+            quality={0.8}
+            pictureSize="1280x720"
           >
             {({ camera, status, recordAudioPermissionStatus }) => {
               if (status !== 'READY') return <ActivityIndicator />;