ordering-ui-react-native 0.17.68 → 0.17.69-release

package/src/utils/index.tsx

@@ -154,6 +154,11 @@ export const transformCountryCode = (countryCode : number) => {
   return code?.countryCode
 }
 
+export const verifyCountryCode = (countryCode : string) => {
+  const code = CODES.find((code : any) => code.countryCode === (countryCode || '').toUpperCase())
+  return code?.countryCode
+}
+
 /**
  * Function to check if a number is decimal or not
  * @param {*} value number to check if decimal or not

package/themes/business/index.tsx

@@ -41,6 +41,7 @@ import { MapViewUI as MapView } from './src/components/MapView'
 import { NewOrderNotification } from './src/components/NewOrderNotification';
 import { DriverSchedule } from './src/components/DriverSchedule';
 import { ScheduleBlocked } from './src/components/ScheduleBlocked';
+import { OrderDetailsLogistic } from './src/components/OrderDetailsLogistic'
 //OComponents
 import {
   OText,
@@ -110,6 +111,7 @@ export {
   VerifyPhone,
   DriverSchedule,
   ScheduleBlocked,
+  OrderDetailsLogistic,
   //OComponents
   OAlert,
   OButton,

package/themes/business/src/components/AcceptOrRejectOrder/index.tsx

@@ -7,23 +7,22 @@ import {
   View,
   KeyboardAvoidingView,
   TextInput,
-  StyleSheet
+  StyleSheet,
+  TouchableOpacity
 } from 'react-native';
 import { useTheme } from 'styled-components/native';
 import SelectDropdown from 'react-native-select-dropdown'
-import { useLanguage, useSession } from 'ordering-components/native';
-import { Content, Timer, TimeField, Header, Action, Comments, CommentsButtonGroup } from './styles';
-import { FloatingButton } from '../FloatingButton';
-import { OText, OButton, OTextarea, OIconButton } from '../shared';
+import { useLanguage } from 'ordering-components/native';
+import { Content, Timer, TimeField, Header, Comments, CommentsButtonGroup, TopActions } from './styles';
+import { OText, OButton, OTextarea, OIcon } from '../shared';
 import { AcceptOrRejectOrderParams } from '../../types';
-import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
 import { orderCommentList } from '../../../../../src/utils'
 
 export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
   const {
+    isPage,
     customerCellphone,
-    loading,
     action,
     handleUpdateOrder,
     actions,
@@ -35,7 +34,6 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
   } = props;
 
   const [, t] = useLanguage();
-  const [{ user }] = useSession();
   const theme = useTheme();
   const scrollViewRef = useRef<any>(null);
   const viewRef = useRef<any>(null);
@@ -46,11 +44,9 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
   const [time, setTime] = useState('');
   const [comments, setComments] = useState('');
   const [rejectReason, setRejectReason] = useState(null);
-  const [isKeyboardShow, setIsKeyboardShow] = useState(false);
-  const { top, bottom } = useSafeAreaInsets()
+  const [keyboardState, setKeyboardState] = useState({ show: false, height: 0 });
 
   const isDriverApp = appTitle?.key === 'DELIVERY_APP'
-
   const orderCommentsList = orderCommentList(action)
 
   let codeNumberPhone, numberPhone, numberToShow;
@@ -93,6 +89,39 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
       alignItems: 'center',
       paddingHorizontal: 10
     },
+    parent: {
+      flex: 1,
+      backgroundColor: theme.colors.backgroundPage,
+    },
+    upper: {
+      flex: 1,
+      zIndex: 1001,
+      paddingTop: isPage ? 30 : 40,
+      marginBottom: 10,
+      backgroundColor: theme.colors.backgroundPage
+    },
+    bottomParent: {
+      justifyContent: "center",
+      paddingHorizontal: 30,
+      alignItems: "center",
+      width: '100%',
+      height: 45,
+    },
+    bottom: {
+      textAlignVertical: "center",
+      textAlign: "center",
+    },
+    btnBackArrow: {
+      borderWidth: 0,
+      width: 32,
+      height: 32,
+      tintColor: theme.colors.textGray,
+      backgroundColor: theme.colors.clear,
+      borderColor: theme.colors.clear,
+      shadowColor: theme.colors.clear,
+      paddingLeft: 0,
+      paddingRight: 0
+    },
   })
 
   const handleFocus = () => {
@@ -101,25 +130,6 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
     });
   };
 
-  useEffect(() => {
-    const keyboardDidShowListener = Keyboard.addListener(
-      'keyboardDidShow',
-      () => {
-        setIsKeyboardShow(true);
-      },
-    );
-    const keyboardDidHideListener = Keyboard.addListener(
-      'keyboardDidHide',
-      () => {
-        setIsKeyboardShow(false);
-      },
-    );
-    return () => {
-      keyboardDidShowListener.remove();
-      keyboardDidHideListener.remove();
-    };
-  }, []);
-
   if (!notShowCustomerPhone) {
     if (phoneNumber) {
       codeNumberPhone = phoneNumber.slice(0, 3);
@@ -172,15 +182,15 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
   };
 
   const openTimerIOnput = () => {
-    const isFocus = timerRef.current.isFocused();
+    const isFocus = timerRef.current?.isFocused();
     if (isFocus) {
-      timerRef.current.blur();
+      timerRef.current?.blur();
     }
 
   };
 
   const openTextTareaOInput = () => {
-    const isFocus = textTareaRef.current.isFocused();
+    const isFocus = textTareaRef.current?.isFocused();
     if (isFocus && textTareaRef?.current) {
       textTareaRef.current.blur();
     }
@@ -205,7 +215,7 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
         status: 7,
       },
       rejectByBusiness: {
-        comment: comments,
+        reasons: comments,
         status: 5,
       },
       acceptByDriver: {
@@ -213,22 +223,22 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
         status: 8,
       },
       rejectByDriver: {
-        comment: comments,
+        reasons: comments,
         status: 6,
         reject_reason: rejectReason
       },
       pickupFailedByDriver: {
-        comment: comments,
+        reasons: comments,
         status: 10,
         reject_reason: rejectReason
       },
       deliveryFailedByDriver: {
-        comment: comments,
+        reasons: comments,
         status: 12,
         reject_reason: rejectReason
       },
       orderNotReady: {
-        comment: comments,
+        reasons: comments,
         status: 14,
         reject_reason: rejectReason
       },
@@ -281,227 +291,242 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
     }
   }, [timerRef?.current])
 
+  useEffect(() => {
+    const keyboardDidShowListener =
+      Keyboard.addListener('keyboardDidShow', (e) => setKeyboardState({
+        show: true,
+        height: e.endCoordinates.height > 100
+          ? Platform.OS == 'ios' ? e.endCoordinates.height : 0 : 0
+      }))
+    const keyboardDidHideListener =
+      Keyboard.addListener('keyboardDidHide', () => setKeyboardState({ show: false, height: 0 }))
+    return () => {
+      keyboardDidShowListener.remove()
+      keyboardDidHideListener.remove()
+    }
+  }, [])
+
   return (
-    <KeyboardAvoidingView
-      enabled
-      behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
-      style={{ flex: 1, paddingHorizontal: 30, paddingVertical: 30, marginTop: top, marginBottom: bottom, justifyContent: 'space-between' }}>
-      <View>
-        <OIconButton
-          icon={theme.images.general.arrow_left}
-          borderColor={theme.colors.clear}
-          iconStyle={{ width: 20, height: 20 }}
-          style={{
-            maxWidth: 40,
-            height: 35,
-            justifyContent: 'flex-end',
-            marginBottom: 30,
-          }}
-          onClick={() => handleArrowBack()}
-        />
-        <OText
-          size={20}
-          color={theme.colors.textGray}
-          style={{
-            fontFamily: 'Poppins',
-            fontStyle: 'normal',
-          }}
-          weight="600">
-          {titleOrder}
-        </OText>
-      </View>
-      <Content showsVerticalScrollIndicator={false} ref={scrollViewRef}>
-        <Header>
-          {action === 'reject' && (
-            <>
-              {!notShowCustomerPhone && (
+    <KeyboardAvoidingView style={{ flex: 1 }}>
+      <View style={styles.parent}>
+        <View style={styles.upper}>
+          <TopActions>
+            <TouchableOpacity onPress={() => handleArrowBack()} style={styles.btnBackArrow}>
+              <OIcon src={theme.images.general.arrow_left} color={theme.colors.textGray} />
+            </TouchableOpacity>
+            <OText
+              size={20}
+              color={theme.colors.textGray}
+              style={{
+                fontFamily: 'Poppins',
+                fontStyle: 'normal',
+                marginBottom: 10,
+              }}
+              weight="600">
+              {titleOrder}
+            </OText>
+          </TopActions>
+          <Content showsVerticalScrollIndicator={false} ref={scrollViewRef}>
+            <Header>
+              {action === 'reject' && (
                 <>
+                  {!notShowCustomerPhone && (
+                    <>
+                      <OText
+                        size={15}
+                        color={theme.colors.textGray}
+                        style={{ marginTop: 10 }}>
+                        {t(
+                          'CALL_YOUR_CUSTOMER_TO_RESOLVE_THE_ISSUE_AS_POLITELY_AS_POSSIBLE',
+                          'Call your customer to resolve the issue as politely as possible',
+                        )}
+                      </OText>
+
+                      {!!numberToShow ? (
+                        <OButton
+                          bgColor="transparent"
+                          borderColor={theme.colors.primary}
+                          textStyle={{
+                            color: theme.colors.primary,
+                            fontSize: 20,
+                          }}
+                          style={{
+                            borderRadius: 10,
+                            marginVertical: 20,
+                          }}
+                          imgLeftStyle={{
+                            resizeMode: 'contain',
+                            left: 20,
+                            position: 'absolute',
+                          }}
+                          imgLeftSrc={theme.images.general.cellphone}
+                          text={numberToShow}
+                          onClick={() =>
+                            Linking.openURL(`tel:${customerCellphone}`)
+                          }
+                        />
+                      ) : (
+                        <OButton
+                          bgColor="transparent"
+                          borderColor={theme.colors.primary}
+                          textStyle={{
+                            color: theme.colors.primary,
+                            fontSize: 15,
+                          }}
+                          style={{
+                            borderRadius: 10,
+                            marginVertical: 20,
+                          }}
+                          imgLeftStyle={{
+                            resizeMode: 'contain',
+                            left: 20,
+                            position: 'absolute',
+                          }}
+                          isDisabled={true}
+                          imgLeftSrc={theme.images.general.cellphone}
+                          text={t('NOT_NUMBER', "There's not phonenumber.")}
+                          onClick={() =>
+                            Linking.openURL(`tel:${customerCellphone}`)
+                          }
+                        />
+                      )}
+                    </>
+                  )}
+
                   <OText
                     size={15}
                     color={theme.colors.textGray}
-                    style={{ marginTop: 10 }}>
+                    style={{ marginBottom: 10 }}>
                     {t(
-                      'CALL_YOUR_CUSTOMER_TO_RESOLVE_THE_ISSUE_AS_POLITELY_AS_POSSIBLE',
-                      'Call your customer to resolve the issue as politely as possible',
+                      'MARK_THE_ORDER_AS_REJECTED',
+                      'Mark the order as rejected',
                     )}
                   </OText>
 
-                  {numberToShow ? (
-                    <OButton
-                      bgColor="transparent"
-                      borderColor={theme.colors.primary}
-                      textStyle={{
-                        color: theme.colors.primary,
-                        fontSize: 20,
-                      }}
-                      style={{
-                        borderRadius: 10,
-                        marginVertical: 20,
-                      }}
-                      imgLeftStyle={{
-                        resizeMode: 'contain',
-                        left: 20,
-                        position: 'absolute',
-                      }}
-                      imgLeftSrc={theme.images.general.cellphone}
-                      text={numberToShow}
-                      onClick={() =>
-                        Linking.openURL(`tel:${customerCellphone}`)
-                      }
-                    />
-                  ) : (
-                    <OButton
-                      bgColor="transparent"
-                      borderColor={theme.colors.primary}
-                      textStyle={{
-                        color: theme.colors.primary,
-                        fontSize: 15,
-                      }}
-                      style={{
-                        borderRadius: 10,
-                        marginVertical: 20,
-                      }}
-                      imgLeftStyle={{
-                        resizeMode: 'contain',
-                        left: 20,
-                        position: 'absolute',
-                      }}
-                      isDisabled={true}
-                      imgLeftSrc={theme.images.general.cellphone}
-                      text={t('NOT_NUMBER', "There's not phonenumber.")}
-                      onClick={() =>
-                        Linking.openURL(`tel:${customerCellphone}`)
-                      }
-                    />
-                  )}
+                  <OText>
+                    <OText style={{ fontWeight: '600' }}>
+                      {t('NOTE', 'Note')}
+                      {': '}
+                    </OText>
+
+                    <OText size={15} color={theme.colors.textGray}>
+                      {t(
+                        'YOUR_CUSTOMER_WILL_RECEIVE_A_NOTIFICATION_ABOUT_THIS_ACTIONS',
+                        'Your customer will receive a notification about this actions',
+                      )}
+                    </OText>
+                  </OText>
                 </>
               )}
+            </Header>
 
-              <OText
-                size={15}
-                color={theme.colors.textGray}
-                style={{ marginBottom: 10 }}>
-                {t(
-                  'MARK_THE_ORDER_AS_REJECTED',
-                  'Mark the order as rejected',
-                )}
-              </OText>
-
-              <OText>
-                <OText style={{ fontWeight: '600' }}>
-                  {t('NOTE', 'Note')}
-                  {': '}
-                </OText>
-
-                <OText size={15} color={theme.colors.textGray}>
-                  {t(
-                    'YOUR_CUSTOMER_WILL_RECEIVE_A_NOTIFICATION_ABOUT_THIS_ACTIONS',
-                    'Your customer will receive a notification about this actions',
-                  )}
-                </OText>
-              </OText>
-            </>
-          )}
-        </Header>
-
-        {action === 'accept' && (
-          <View style={{ height: 400, justifyContent: 'center' }}>
-            <Timer onPress={() => openTimerIOnput()}>
-              <OText weight="600" style={{ textAlign: 'center' }} size={55}>
-                {hour}
-              </OText>
-              {hour.length > 0 && <OText size={55}>:</OText>}
-              <OText weight="600" style={{ textAlign: 'center' }} size={55}>
-                {min}
-              </OText>
-            </Timer>
-          </View>
-        )}
-        <TimeField
-          ref={timerRef}
-          keyboardType="numeric"
-          value={time}
-          placeholder={'00:00'}
-          onChangeText={handleTime}
-          onPressOut={() => handleFixTime()}
-          editable={true}
-          selectionColor={theme.colors.primary}
-          placeholderTextColor={theme.colors.textGray}
-          color={theme.colors.textGray}
-          onEndEditing={handleFixTime}
-          onSubmitEditing={() => handleAcceptOrReject()}
-          onBlur={() => actions && action === 'accept' && timerRef?.current?.focus?.()}
-        />
-
-        {orderCommentsList && isDriverApp && (
-          <CommentsButtonGroup>
-            <SelectDropdown
-              defaultButtonText={t('REJECT_REASONS_OPTIONS', 'Reject reasons')}
-              data={orderCommentsList?.list}
-              onSelect={(selectedItem) => {
-                setRejectReason(selectedItem?.value)
-              }}
-              buttonTextAfterSelection={(selectedItem) => selectedItem.content}
-              rowTextForSelection={(item) => item.key}
-              buttonStyle={styles.selectOption}
-              buttonTextStyle={styles.buttonTextStyle}
-              renderDropdownIcon={isOpened => {
-                return <FeatherIcon name={isOpened ? 'chevron-up' : 'chevron-down'} color={'#444'} size={18} />;
-              }}
-              dropdownStyle={styles.dropdownStyle}
-              dropdownOverlayColor='transparent'
-              rowStyle={styles.rowStyle}
-              renderCustomizedRowChild={(item) => {
-                return (
-                  <View
-                    style={{
-                      flexDirection: 'row',
-                      alignItems: 'center'
-                    }}
-                  >
-                    <View>
-                      <OText
-                        size={14}
-                        color={'#748194'}
-                        style={{ textTransform: 'capitalize' }}
-                      >
-                        {item?.content}
-                      </OText>
-                    </View>
-                  </View>
-                );
-              }}
-            />
-          </CommentsButtonGroup>
-        )}
-
-        {showTextArea && (
-          <Comments ref={viewRef}>
-            <OTextarea
-              textTareaRef={textTareaRef}
-              autoFocus
-              onFocus={handleFocus}
-              placeholder={t(
-                'PLEASE_TYPE_YOUR_COMMENTS_IN_HERE',
-                'Please type your comments in here',
-              )}
-              value={comments}
-              onChange={setComments}
+            {action === 'accept' && (
+              <View style={{ height: 300, justifyContent: 'center' }}>
+                <Timer onPress={() => openTimerIOnput()}>
+                  <OText weight="600" style={{ textAlign: 'center' }} size={55}>
+                    {hour}
+                  </OText>
+                  {hour.length > 0 && <OText size={55}>:</OText>}
+                  <OText weight="600" style={{ textAlign: 'center' }} size={55}>
+                    {min}
+                  </OText>
+                </Timer>
+              </View>
+            )}
+            <TimeField
+              ref={timerRef}
+              keyboardType="numeric"
+              value={time}
+              placeholder={'00:00'}
+              onChangeText={handleTime}
+              onPressOut={() => handleFixTime()}
+              editable={true}
+              selectionColor={theme.colors.primary}
+              placeholderTextColor={theme.colors.textGray}
+              color={theme.colors.textGray}
+              onEndEditing={handleFixTime}
+              onSubmitEditing={() => handleAcceptOrReject()}
+              onBlur={() => actions && action === 'accept' && timerRef?.current?.focus?.()}
             />
-          </Comments>
-        )}
-      </Content>
-
-      <Action>
-        <FloatingButton
-          firstButtonClick={() => {
-            handleAcceptOrReject();
+
+            {orderCommentsList && isDriverApp && (
+              <CommentsButtonGroup>
+                <SelectDropdown
+                  defaultButtonText={t('REJECT_REASONS_OPTIONS', 'Reject reasons')}
+                  data={orderCommentsList?.list}
+                  onSelect={(selectedItem) => {
+                    setRejectReason(selectedItem?.value)
+                  }}
+                  buttonTextAfterSelection={(selectedItem) => selectedItem.content}
+                  rowTextForSelection={(item) => item.key}
+                  buttonStyle={styles.selectOption}
+                  buttonTextStyle={styles.buttonTextStyle}
+                  renderDropdownIcon={isOpened => {
+                    return <FeatherIcon name={isOpened ? 'chevron-up' : 'chevron-down'} color={'#444'} size={18} />;
+                  }}
+                  dropdownStyle={styles.dropdownStyle}
+                  dropdownOverlayColor='transparent'
+                  rowStyle={styles.rowStyle}
+                  renderCustomizedRowChild={(item) => {
+                    return (
+                      <View
+                        style={{
+                          flexDirection: 'row',
+                          alignItems: 'center'
+                        }}
+                      >
+                        <View>
+                          <OText
+                            size={14}
+                            color={'#748194'}
+                            style={{ textTransform: 'capitalize' }}
+                          >
+                            {item?.content}
+                          </OText>
+                        </View>
+                      </View>
+                    );
+                  }}
+                />
+              </CommentsButtonGroup>
+            )}
+
+            {showTextArea && (
+              <Comments ref={viewRef}>
+                <OTextarea
+                  textTareaRef={textTareaRef}
+                  autoFocus
+                  onFocus={handleFocus}
+                  placeholder={t(
+                    'PLEASE_TYPE_YOUR_COMMENTS_IN_HERE',
+                    'Please type your comments in here',
+                  )}
+                  value={comments}
+                  onChange={setComments}
+                />
+              </Comments>
+            )}
+          </Content>
+        </View>
+        <View
+          style={{
+            ...styles.bottomParent,
+            marginBottom: (keyboardState.height === 0) ? isPage ? 0 : 30 : keyboardState.height - (isPage ? 20 : -10)
           }}
-          btnText={buttonText}
-          color={action === 'accept' ? theme.colors.green : theme.colors.red}
-          widthButton={'100%'}
-        />
-      </Action>
+        >
+          <OButton
+            text={buttonText}
+            bgColor={action === 'accept' ? theme.colors.green : theme.colors.red}
+            borderColor={action === 'accept' ? theme.colors.green : theme.colors.red}
+            imgRightSrc={null}
+            style={{ borderRadius: 7, height: 45 }}
+            parentStyle={{ width: '100%' }}
+            textStyle={{ color: '#FFF', fontSize: 18 }}
+            isDisabled={showTextArea && !comments}
+            onClick={() => handleAcceptOrReject()}
+          />
+        </View>
+      </View>
     </KeyboardAvoidingView>
   );
 };

package/themes/business/src/components/AcceptOrRejectOrder/styles.tsx

@@ -1,10 +1,14 @@
 import styled from 'styled-components/native';
 
 export const Content = styled.ScrollView`
-  background-color: ${(props: any) => props.theme.colors.white};
-  margin-bottom: 30px;
+  padding-horizontal: 30px;
 `;
 
+export const TopActions = styled.View`
+  padding-horizontal: 30px;
+  padding-bottom: 10px;
+`
+
 export const Timer = styled.TouchableOpacity`
   padding: 40px;
   justify-content: center;
@@ -29,8 +33,6 @@ export const TimeField = styled.TextInput`
 
 export const Header = styled.View``;
 
-export const Action = styled.View``;
-
 export const Comments = styled.View`
   margin-top: 20px;
   padding-bottom: 40px;

package/themes/business/src/components/BusinessController/index.tsx

@@ -97,7 +97,6 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
             <Logo style={styles.logo}>
               <OIcon
                 url={optimizeImage(business?.logo, 'h_300,c_limit')}
-                src={!business?.logo && theme?.images?.dummies?.businessLogo}
                 style={styles.icon}
               />
             </Logo>