react-native-timacare 3.1.6-beta → 3.1.7-beta

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

@@ -465,6 +465,13 @@ export default function ReviewLoan(props: any) {
                           : appStore.listLoanTime,
                       callback: (value) => {
                         setFieldValue('loanTime', value?.id);
+                        getInfoInsurence(
+                          values.loanAmount,
+                          value?.id,
+                          values?.rateTypeId,
+                          values.timeInsurenceCustomer?.id,
+                          values.timeInsuranceProperty?.id
+                        );
                       },
                     });
                   }}
@@ -586,7 +593,7 @@ export default function ReviewLoan(props: any) {
                       }}
                     >
                       <MText style={{ fontSize: 12, color: '#333333' }}>
-                        {values.timeInsurenceCustomer?.name}
+                        {values.timeInsurenceCustomer?.name ?? 'Chọn thời gian'}
                       </MText>
                       <DropDown2 />
                     </TouchableOpacity>
@@ -679,7 +686,7 @@ export default function ReviewLoan(props: any) {
                       }}
                     >
                       <MText style={{ fontSize: 12, color: '#333333' }}>
-                        {values.timeInsuranceProperty?.name}
+                        {values.timeInsuranceProperty?.name ?? 'Chọn thời gian'}
                       </MText>
                       <DropDown2 />
                     </TouchableOpacity>
@@ -1116,11 +1123,10 @@ export default function ReviewLoan(props: any) {
                     </MText>
                   </LinearGradient>
                 </MButton>
-
-                <KeyboardSpacer />
               </ScrollView>
             )}
           </Formik>
+          <KeyboardSpacer />
         </View>
       </View>
       <Loading isLoading={isLoading} />

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

@@ -33,6 +33,8 @@ import { RNCamera } from 'react-native-camera';
 import { commonStyles } from '../CommonStyles';
 import { ScreenNames } from '../../navigation';
 import { load, OCR_V2, save } from '../../utils/storage';
+import { IconUpload } from '../../assets/svgs';
+import ImagePicker from 'react-native-image-crop-picker';
 
 export default function VehicleCamera(props: any) {
   const navigation = useNavigation();
@@ -173,6 +175,25 @@ export default function VehicleCamera(props: any) {
     loadIntro();
   }, []);
 
+  const pickImageFromGallery = async () => {
+    ImagePicker.openPicker({}).then((image) => {
+      if (props?.route?.params?.front) {
+        navigation.push(ScreenNames.VehicleRegistrationFront, {
+          uri: image?.sourceURL,
+          loan: props?.route?.params?.loan,
+        });
+      } else if (props.route?.params?.callback) {
+        navigation.goBack();
+        props.route?.params?.callback(image?.sourceURL);
+      } else {
+        navigation.push(ScreenNames.VehicleRegistrationBack, {
+          uri: image?.sourceURL,
+          loan: props?.route?.params?.loan,
+        });
+      }
+    });
+  };
+
   return (
     <View
       style={[$flex, { backgroundColor: 'black' }]}
@@ -211,96 +232,115 @@ export default function VehicleCamera(props: any) {
               if (status !== 'READY') return <ActivityIndicator />;
             }}
           </RNCamera>
+          <TouchableOpacity
+            onPress={() => {
+              pickImageFromGallery();
+            }}
+            style={{
+              flexDirection: 'row',
+              alignItems: 'center',
+              gap: 8,
+              marginTop: 16,
+            }}
+          >
+            <IconUpload />
+            <MText
+              style={{
+                color: 'white',
+                fontSize: 12,
+              }}
+            >
+              Tải ảnh từ thư viện
+            </MText>
+          </TouchableOpacity>
         </View>
       )}
 
-      {!showModal && (
-        <SafeAreaView
+      <SafeAreaView
+        style={[
+          commonStyles.fill,
+          { position: 'absolute', width: '100%', height: '100%' },
+        ]}
+      >
+        <View
           style={[
-            commonStyles.fill,
-            { position: 'absolute', width: '100%', height: '100%' },
+            commonStyles.row,
+            commonStyles.alignCenter,
+            { paddingVertical: 16 },
           ]}
         >
-          <View
+          <MButton
+            onPress={() => {
+              navigation.goBack();
+            }}
             style={[
-              commonStyles.row,
-              commonStyles.alignCenter,
-              { paddingVertical: 16 },
+              {
+                width: 48,
+                height: 48,
+                zIndex: 1000,
+                position: 'absolute',
+                left: 16,
+                top: 16,
+              },
             ]}
           >
-            <MButton
-              onPress={() => {
-                navigation.goBack();
-              }}
-              style={[
-                {
-                  width: 48,
-                  height: 48,
-                  zIndex: 1000,
-                  position: 'absolute',
-                  left: 16,
-                  top: 16,
-                },
-              ]}
-            >
-              <IconBackWhite />
-            </MButton>
-            <View style={{ flex: 1, alignItems: 'center' }}>
-              <MText style={$title}>ĐĂNG KÝ XE</MText>
-            </View>
+            <IconBackWhite />
+          </MButton>
+          <View style={{ flex: 1, alignItems: 'center' }}>
+            <MText style={$title}>ĐĂNG KÝ XE</MText>
           </View>
-          <MText
-            style={{
-              color: 'white',
-              textAlign: 'center',
-            }}
-          >
-            {title}
-          </MText>
-          <View
-            style={{
-              position: 'absolute',
-              bottom: 20,
-              left: 0,
-              right: 0,
-            }}
-          >
-            {!taking && (
-              <>
-                <MText
-                  style={{
-                    color: 'white',
-                    textAlign: 'center',
-                    fontSize: 14,
-                  }}
-                >
-                  Vui lòng đặt giấy tờ nằm vừa khung hình chữ nhật,{'\n'}chụp đủ
-                  ánh sáng và rõ nét.
-                </MText>
-                <View
-                  style={{
-                    alignItems: 'center',
-                    marginVertical: 24,
+        </View>
+        <MText
+          style={{
+            color: 'white',
+            textAlign: 'center',
+          }}
+        >
+          {title}
+        </MText>
+        <View
+          style={{
+            position: 'absolute',
+            bottom: 20,
+            left: 0,
+            right: 0,
+          }}
+        >
+          {!taking && (
+            <>
+              <MText
+                style={{
+                  color: 'white',
+                  textAlign: 'center',
+                  fontSize: 14,
+                }}
+              >
+                Vui lòng đặt giấy tờ nằm vừa khung hình chữ nhật,{'\n'}chụp đủ
+                ánh sáng và rõ nét.
+              </MText>
+              <View
+                style={{
+                  alignItems: 'center',
+                  marginVertical: 24,
+                }}
+              >
+                <MButton
+                  onPress={() => {
+                    takePhoto();
                   }}
                 >
-                  <MButton
-                    onPress={() => {
-                      takePhoto();
-                    }}
-                  >
-                    <TakePhotoSvg />
-                  </MButton>
-                </View>
-              </>
-            )}
-          </View>
-        </SafeAreaView>
-      )}
+                  <TakePhotoSvg />
+                </MButton>
+              </View>
+            </>
+          )}
+        </View>
+      </SafeAreaView>
       <Modal
         isVisible={showModal}
         style={$modal}
         backdropTransitionInTiming={0}
-        nimationOutTiming={200}
+        animationOutTiming={200}
         animationInTiming={200}
         animationIn={'slideInUp'}
         animationOut={'fadeOutDown'}
@@ -311,7 +351,10 @@ export default function VehicleCamera(props: any) {
           <View style={$paddingV}>
             <TouchableOpacity
               onPress={() => {
-                navigation.goBack();
+                setShowModal(false);
+                setTimeout(() => {
+                  navigation.goBack();
+                }, 100);
               }}
               style={{
                 width: 24,

package/src/screens/toan-trinh-so/store.ts

@@ -15,6 +15,7 @@ class Store {
     listBrand = []
 
     listRelationship = []
+    listJob = []
 
     constructor() {
         makeAutoObservable(this);
@@ -231,6 +232,23 @@ class Store {
         }
     }
 
+
+    async getJob() {
+        try {
+            const response = await Api.getInstance().getJobTima();
+            if (response.kind === 'ok') {
+                if (response.data.meta.errorCode === 200) {
+                    this.listJob = response.data.data;
+                } else {
+                    Alert.alert('Thông báo', response.data.meta.errorMessage);
+                }
+            } else {
+                // Alert.alert('Thông báo', 'Không lấy được danh sách nghề nghi.');
+            }
+        } catch (error) {
+            console.log(error);
+        }
+    }
 }
 
 const ttsStore = new Store();

package/src/services/api/api.ts

@@ -2862,4 +2862,6 @@ export class Api {
       return { kind: "bad-data" }
     }
   }
+
+
 }