react-native-timacare 1.0.20 → 1.0.22

package/src/screens/full-submit/accept_policy.tsx

@@ -40,6 +40,8 @@ export const AcceptPolicy = observer(function AcceptPolicy(props: any) {
   const ref = useRef<any>();
   const [BuyInsuranceOfCustomer, setBuyInsuranceOfCustomer] = useState(true);
   const [BuyInsuranceOfProperty, setBuyInsuranceOfProperty] = useState(true);
+  const [BuyInsuranceHospital, setBuyInsuranceHospital] = useState(true);
+
   const [ruleCIMB, setRuleCIMB] = useState(true);
   const [ruleTima, setRuleTima] = useState(true);
   const [isLoading, setIsLoading] = useState(false);
@@ -82,8 +84,11 @@ export const AcceptPolicy = observer(function AcceptPolicy(props: any) {
             onPress: () => {
               const body = {
                 FeeInsuranceOfCustomer: data?.feeInsuranceOfCustomer,
-                BuyInsuranceOfCustomer: BuyInsuranceOfCustomer,
-                BuyInsuranceOfProperty: BuyInsuranceOfProperty,
+                // tái vay thì mặc định truyền true
+                BuyInsuranceOfCustomer:
+                  loan?.typeLoan === 2 ? true : BuyInsuranceOfCustomer,
+                BuyInsuranceOfProperty:
+                  loan?.typeLoan === 2 ? true : BuyInsuranceOfProperty,
                 FeeInsuranceOfProperty: data?.feeInsuranceOfProperty,
               };
               setIsLoading(true);
@@ -119,9 +124,14 @@ export const AcceptPolicy = observer(function AcceptPolicy(props: any) {
             onPress: () => {
               const body = {
                 FeeInsuranceOfCustomer: data?.feeInsuranceOfCustomer,
-                BuyInsuranceOfCustomer: BuyInsuranceOfCustomer,
-                BuyInsuranceOfProperty: BuyInsuranceOfProperty,
+                // tái vay thì mặc định truyền true
+                BuyInsuranceOfCustomer:
+                  loan?.typeLoan === 2 ? true : BuyInsuranceOfCustomer,
+                BuyInsuranceOfProperty:
+                  loan?.typeLoan === 2 ? true : BuyInsuranceOfProperty,
                 FeeInsuranceOfProperty: data?.feeInsuranceOfProperty,
+                BuyInsuranceHospital: BuyInsuranceHospital,
+                FeeInsuranceHospital: data?.feeInsuranceHospital,
               };
               setIsLoading(true);
               FullSubmitStore.confirmInsurance(body, () => {
@@ -378,24 +388,128 @@ export const AcceptPolicy = observer(function AcceptPolicy(props: any) {
             <MText style={{ color: '#828282', fontSize: 14 }}>
               Số tiền thực nhận (Trừ phí)
             </MText>
-            <MText
-              style={{ fontWeight: 'bold', fontSize: 14, color: color.primary }}
-            >
-              {!BuyInsuranceOfCustomer && !BuyInsuranceOfProperty
-                ? formatMoney(data?.loanAmount)
-                : !BuyInsuranceOfCustomer && BuyInsuranceOfProperty
-                ? formatMoney(data?.loanAmount - data?.feeInsuranceOfProperty)
-                : BuyInsuranceOfCustomer && !BuyInsuranceOfProperty
-                ? formatMoney(data?.loanAmount - data?.feeInsuranceOfCustomer)
-                : BuyInsuranceOfCustomer && BuyInsuranceOfProperty
-                ? formatMoney(
+
+            {BuyInsuranceOfCustomer &&
+              BuyInsuranceOfProperty &&
+              BuyInsuranceHospital && (
+                <MText
+                  style={{
+                    fontWeight: 'bold',
+                    fontSize: 14,
+                    color: color.primary,
+                  }}
+                >
+                  {formatMoney(data?.loanAmount)}
+                </MText>
+              )}
+            {!BuyInsuranceOfCustomer &&
+              BuyInsuranceOfProperty &&
+              BuyInsuranceHospital && (
+                <MText
+                  style={{
+                    fontWeight: 'bold',
+                    fontSize: 14,
+                    color: color.primary,
+                  }}
+                >
+                  {formatMoney(data?.loanAmount - data?.feeInsuranceOfCustomer)}
+                </MText>
+              )}
+            {BuyInsuranceOfCustomer &&
+              BuyInsuranceOfProperty &&
+              !BuyInsuranceHospital && (
+                <MText
+                  style={{
+                    fontWeight: 'bold',
+                    fontSize: 14,
+                    color: color.primary,
+                  }}
+                >
+                  {formatMoney(data?.loanAmount - data?.feeInsuranceHospital)}
+                </MText>
+              )}
+            {BuyInsuranceOfCustomer &&
+              !BuyInsuranceOfProperty &&
+              BuyInsuranceHospital && (
+                <MText
+                  style={{
+                    fontWeight: 'bold',
+                    fontSize: 14,
+                    color: color.primary,
+                  }}
+                >
+                  {formatMoney(data?.loanAmount - data?.feeInsuranceOfProperty)}
+                </MText>
+              )}
+            {!BuyInsuranceOfCustomer &&
+              !BuyInsuranceOfProperty &&
+              BuyInsuranceHospital && (
+                <MText
+                  style={{
+                    fontWeight: 'bold',
+                    fontSize: 14,
+                    color: color.primary,
+                  }}
+                >
+                  {formatMoney(
+                    data?.loanAmount -
+                      data?.feeInsuranceOfProperty -
+                      data?.feeInsuranceOfCustomer
+                  )}
+                </MText>
+              )}
+            {!BuyInsuranceOfCustomer &&
+              BuyInsuranceOfProperty &&
+              !BuyInsuranceHospital && (
+                <MText
+                  style={{
+                    fontWeight: 'bold',
+                    fontSize: 14,
+                    color: color.primary,
+                  }}
+                >
+                  {formatMoney(
                     data?.loanAmount -
                       data?.feeInsuranceOfCustomer -
-                      data?.feeInsuranceOfProperty
-                  )
-                : ''}
-              đ
-            </MText>
+                      data?.feeInsuranceHospital
+                  )}
+                </MText>
+              )}
+            {BuyInsuranceOfCustomer &&
+              !BuyInsuranceOfProperty &&
+              !BuyInsuranceHospital && (
+                <MText
+                  style={{
+                    fontWeight: 'bold',
+                    fontSize: 14,
+                    color: color.primary,
+                  }}
+                >
+                  {formatMoney(
+                    data?.loanAmount -
+                      data?.feeInsuranceOfProperty -
+                      data?.feeInsuranceHospital
+                  )}
+                </MText>
+              )}
+            {!BuyInsuranceOfCustomer &&
+              !BuyInsuranceOfProperty &&
+              !BuyInsuranceHospital && (
+                <MText
+                  style={{
+                    fontWeight: 'bold',
+                    fontSize: 14,
+                    color: color.primary,
+                  }}
+                >
+                  {formatMoney(
+                    data?.loanAmount -
+                      data?.feeInsuranceOfProperty -
+                      data?.feeInsuranceHospital -
+                      data?.feeInsuranceOfCustomer
+                  )}
+                </MText>
+              )}
           </View>
         </View>
         <View style={[styles.box, { marginTop: 8 }]}>
@@ -453,6 +567,31 @@ export const AcceptPolicy = observer(function AcceptPolicy(props: any) {
               {formatMoney(data?.feeInsuranceOfProperty)}đ
             </MText>
           </View>
+          <View
+            style={{
+              marginTop: 8,
+              flexDirection: 'row',
+              justifyContent: 'space-between',
+            }}
+          >
+            <TouchableOpacity
+              style={{
+                flexDirection: 'row',
+                alignItems: 'center',
+              }}
+              onPress={() => {
+                setBuyInsuranceHospital(!BuyInsuranceHospital);
+              }}
+            >
+              {BuyInsuranceHospital ? <CheckBoxActive /> : <CheckBox />}
+              <MText style={{ color: '#828282', marginLeft: 5, fontSize: 14 }}>
+                Phí BH nằm viện
+              </MText>
+            </TouchableOpacity>
+            <MText style={{ fontSize: 14, fontWeight: 'bold' }}>
+              {formatMoney(data?.feeInsuranceHospital)}đ
+            </MText>
+          </View>
           <View
             style={{
               height: 2,
@@ -514,6 +653,34 @@ export const AcceptPolicy = observer(function AcceptPolicy(props: any) {
                 100% từ Bảo Minh
               </MText>
             </View>
+            <View
+              style={{
+                flexDirection: 'row',
+                alignItems: 'center',
+                marginTop: 5,
+              }}
+            >
+              <Tick2 />
+              <MText style={{ color: '#828282', fontSize: 10 }}>
+                Quyền lợi
+              </MText>
+              <View>
+                <MText
+                  style={{
+                    color: '#828282',
+                    // color: '#2F80ED',
+                    fontSize: 10,
+                    // textDecorationLine: 'underline',
+                  }}
+                >
+                  {' '}
+                  bảo hiểm nằm viện{' '}
+                </MText>
+              </View>
+              <MText style={{ color: '#828282', fontSize: 10 }}>
+                100% từ Bảo Minh
+              </MText>
+            </View>
           </View>
         </View>
         <View style={{ marginTop: 16, marginBottom: 24 }}>
@@ -596,9 +763,25 @@ export const AcceptPolicy = observer(function AcceptPolicy(props: any) {
         </View>
       </ScrollView>
       <View>
-        <MButton style={{ paddingHorizontal: 16 }} onPress={() => onSubmit()}>
+        <MButton
+          style={{ paddingHorizontal: 16 }}
+          disable={
+            loan?.typeLoan === 2 &&
+            !BuyInsuranceOfCustomer &&
+            !BuyInsuranceOfProperty
+              ? true
+              : false
+          }
+          onPress={() => onSubmit()}
+        >
           <LinearGradient
-            colors={['#FF7A00', '#EF4123']}
+            colors={
+              loan?.typeLoan === 2 &&
+              !BuyInsuranceOfCustomer &&
+              !BuyInsuranceOfProperty
+                ? ['#BDBDBD', '#BDBDBD']
+                : ['#FF7A00', '#EF4123']
+            }
             style={[
               commonStyles.alignCenter,
               commonStyles.justifyCenter,
@@ -609,7 +792,19 @@ export const AcceptPolicy = observer(function AcceptPolicy(props: any) {
               },
             ]}
           >
-            <MText style={[commonStyles.textNormalBold, { color: 'white' }]}>
+            <MText
+              style={[
+                commonStyles.textNormalBold,
+                {
+                  color:
+                    loan?.typeLoan === 2 &&
+                    !BuyInsuranceOfCustomer &&
+                    !BuyInsuranceOfProperty
+                      ? '#333333'
+                      : 'white',
+                },
+              ]}
+            >
               Hoàn thành
             </MText>
           </LinearGradient>

package/src/screens/home/index.tsx

@@ -109,8 +109,8 @@ export const Home = observer(function Home() {
                 }, 200);
               }
               if (
-                item?.typeLoan === 4 ||
-                (item?.typeLoan === 2 && item?.isCimbApproveFull !== null)
+                (item?.typeLoan === 4 || item?.typeLoan === 2) &&
+                item?.isCimbApproveFull !== null
               ) {
                 const checkShow = await load(`SHOW_${item?.id}`);
                 if (!checkShow || checkShow !== true) {
@@ -848,7 +848,10 @@ export const Home = observer(function Home() {
                                     {/* // cho phép update thông tin */}
                                     {item?.isUpdateLoanReBorrow ? (
                                       <TouchableOpacity
-                                        style={{ marginTop: 14 }}
+                                        style={{
+                                          marginTop: 14,
+                                          marginBottom: 16,
+                                        }}
                                         onPress={() => {
                                           navigation.push(
                                             'DigitalLending',

package/src/services/api/api.ts

@@ -2306,6 +2306,8 @@ export class Api {
   async updateLoanReborrow(body) {
     // make the api call
     const response: ApiResponse<any> = await this.apisauce.post(`api/v2.0/loanbrief/init_reborrow`, body)
+    console.log(response);
+
     if (!response.ok) {
       const problem = getGeneralApiProblem(response)
       if (problem) return problem