ordering-ui-react-native 0.12.14 → 0.12.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.12.14",
+  "version": "0.12.18",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",

package/src/components/AddressList/index.tsx

@@ -57,7 +57,7 @@ const AddressListUI = (props: AddressListParams) => {
 
   const [orderState] = useOrder()
   const [, t] = useLanguage()
-  const [{ auth }] = useSession()
+  const [{ auth }, { logout }] = useSession()
   const [alert, setAlert] = useState<any>({ show: false })
 
   const onNavigatorRedirect = () => {
@@ -261,6 +261,8 @@ const AddressListUI = (props: AddressListParams) => {
                   addressList.error[0] ||
                   t('NETWORK_ERROR', 'Network Error, please reload the app')
                 }
+                btnTitle={t('LOGIN', 'Login')}
+                onClickButton={() => logout()}
               />
             )
           )}

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

@@ -27,6 +27,7 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
     notShowCustomerPhone,
     titleAccept,
     titleReject,
+    titleNotReady,
     appTitle,
   } = props;
 
@@ -43,7 +44,7 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
   const [isKeyboardShow, setIsKeyboardShow] = useState(false);
   const phoneNumber = customerCellphone;
   let codeNumberPhone, numberPhone, numberToShow;
-  const { top, bottom} = useSafeAreaInsets()
+  const { top, bottom } = useSafeAreaInsets()
 
   const handleFocus = () => {
     viewRef?.current?.measure((x: any, y: any) => {
@@ -111,7 +112,7 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
       openTimerIOnput();
     }
 
-    if (actions && (action === 'reject' || action === 'failed')) {
+    if (actions && (action === 'reject' || action === 'failed' || action === 'notReady')) {
       openTextTareaOInput();
     }
   }, []);
@@ -181,6 +182,10 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
       failedByDriver: {
         comment: comments,
         status: 12
+      },
+      orderNotReady: {
+        comment: comments,
+        status: 14
       }
     };
 
@@ -190,9 +195,12 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
     if (actions && action === 'reject') {
       bodyToSend = orderStatus[actions.reject];
     }
-    if(actions && action === 'failed'){
+    if (actions && action === 'failed') {
       bodyToSend = orderStatus[actions.failed]
     }
+    if (actions && action === 'notReady') {
+      bodyToSend = orderStatus[actions.notReady]
+    }
 
     bodyToSend.id = orderId;
 
@@ -200,11 +208,11 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
   };
 
   return (
-      <KeyboardAvoidingView
+    <KeyboardAvoidingView
       enabled
-        behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
-        style={{ flex: 1, paddingHorizontal: 30, paddingTop: 30, marginTop: top, marginBottom: bottom,justifyContent: 'space-between' }}>
-          <View>
+      behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
+      style={{ flex: 1, paddingHorizontal: 30, paddingTop: 30, marginTop: top, marginBottom: bottom, justifyContent: 'space-between' }}>
+      <View>
         <OIconButton
           icon={theme.images.general.arrow_left}
           borderColor={theme.colors.clear}
@@ -227,163 +235,167 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
           weight="600">
           {action === 'accept'
             ? `${t(titleAccept?.key, titleAccept?.text)}:`
-            : t(titleReject?.key, titleReject?.text)}
+            : action === 'notReady'
+              ? t(titleNotReady?.key, titleNotReady?.text)
+              : t(titleReject?.key, titleReject?.text)}
         </OText>
-        </View>
-        <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}`)
-                        }
-                      />
+      </View>
+      <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>
 
-                <OText
-                  size={15}
-                  color={theme.colors.textGray}
-                  style={{ marginBottom: 10 }}>
-                  {t(
-                    'MARK_THE_ORDER_AS_REJECTED',
-                    'Mark the order as rejected',
+                  {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>
-                  <OText style={{ fontWeight: '600' }}>
-                    {t('NOTE', 'Note')}
-                    {': '}
-                  </OText>
+                </>
+              )}
+
+              <OText
+                size={15}
+                color={theme.colors.textGray}
+                style={{ marginBottom: 10 }}>
+                {t(
+                  'MARK_THE_ORDER_AS_REJECTED',
+                  'Mark the order as rejected',
+                )}
+              </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>
+                <OText style={{ fontWeight: '600' }}>
+                  {t('NOTE', 'Note')}
+                  {': '}
                 </OText>
-                {hour.length > 0 && <OText size={55}>:</OText>}
-                <OText weight="600" style={{ textAlign: 'center' }} size={55}>
-                  {min}
+
+                <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>
-              </Timer>
-            </View>
-          )}
-          <TimeField
-            ref={timerRef}
-            keyboardType="numeric"
-            value={time}
-            placeholder={'00:00'}
-            onChangeText={handleTime}
-            onPressOut={() => handleFixTime()}
-            editable={true}
-            autoFocus={actions && action === 'accept'}
-            selectionColor={theme.colors.primary}
-            placeholderTextColor={theme.colors.textGray}
-            color={theme.colors.textGray}
-            onEndEditing={handleFixTime}
-          />
-
-          {(action === 'reject' || action === 'failed') && (
-            <Comments ref={viewRef}>
-              <OTextarea
-                textTareaRef={textTareaRef}
-                autoFocus={actions && (action === 'reject' || action === 'failed')}
-                onFocus={handleFocus}
-                placeholder={t(
-                  'PLEASE_TYPE_YOUR_COMMENTS_IN_HERE',
-                  'Please type your comments in here',
-                )}
-                value={comments}
-                onChange={setComments}
-              />
-              <View style={{ height: 20 }} />
-            </Comments>
+              </OText>
+            </>
           )}
-        </Content>
-
-        <Action>
-          <FloatingButton
-            firstButtonClick={() => {
-              handleAcceptOrReject();
-            }}
-            btnText={
-              action === 'accept'
-                ? t('ACCEPT', 'Accept')
+        </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}
+          autoFocus={actions && action === 'accept'}
+          selectionColor={theme.colors.primary}
+          placeholderTextColor={theme.colors.textGray}
+          color={theme.colors.textGray}
+          onEndEditing={handleFixTime}
+        />
+
+        {(['failed', 'reject', 'notReady']?.includes(action)) && (
+          <Comments ref={viewRef}>
+            <OTextarea
+              textTareaRef={textTareaRef}
+              autoFocus={actions && (action === 'reject' || action === 'failed' || action === 'notReady')}
+              onFocus={handleFocus}
+              placeholder={t(
+                'PLEASE_TYPE_YOUR_COMMENTS_IN_HERE',
+                'Please type your comments in here',
+              )}
+              value={comments}
+              onChange={setComments}
+            />
+            <View style={{ height: 20 }} />
+          </Comments>
+        )}
+      </Content>
+
+      <Action>
+        <FloatingButton
+          firstButtonClick={() => {
+            handleAcceptOrReject();
+          }}
+          btnText={
+            action === 'accept'
+              ? t('ACCEPT', 'Accept')
+              : action === 'notReady'
+                ? t('ORDER_NOT_READY', 'Order not ready')
                 : t('REJECT', 'Reject')
-            }
-            color={action === 'accept' ? theme.colors.green : theme.colors.red}
-            widthButton={'100%'}
-          />
-        </Action>
-      </KeyboardAvoidingView>
+          }
+          color={action === 'accept' ? theme.colors.green : theme.colors.red}
+          widthButton={'100%'}
+        />
+      </Action>
+    </KeyboardAvoidingView>
   );
 };

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

@@ -8,6 +8,7 @@ import { NotificationContainer } from './styles'
 import Sound from 'react-native-sound'
 import moment from 'moment'
 import { useLocation } from '../../hooks/useLocation'
+import { useFocusEffect } from '@react-navigation/core'
 Sound.setCategory('Playback')
 
 const windowWidth = Dimensions.get('screen').width
@@ -23,6 +24,7 @@ export const NewOrderNotification = (props: any) => {
   const [modalOpen, setModalOpen] = useState(false)
   const [newOrderId, setNewOrderId] = useState(null)
   const [soundTimeout, setSoundTimeout] = useState<any>(null)
+  const [isFocused, setIsFocused] = useState(false)
 
   const notificationSound = new Sound(theme.sounds.notification, error => {
     if (error) {
@@ -86,7 +88,9 @@ export const NewOrderNotification = (props: any) => {
         clearInterval(soundTimeout)
         handlePlayNotificationSound()
         setNewOrderId(order.id)
-        setModalOpen(true)
+        if(isFocused){
+          setModalOpen(true)
+        }
       }
     }
   }, [newOrderId, notificationSound, soundTimeout])
@@ -106,6 +110,15 @@ export const NewOrderNotification = (props: any) => {
     }
   }, [])
 
+  useFocusEffect(
+    useCallback(() => {
+      setIsFocused(true)
+      return () => {
+        setIsFocused(false)
+      }
+    }, [])
+  )
+
   return (
     <>
       <Modal

package/themes/business/src/components/OrderDetails/Delivery.tsx

@@ -50,6 +50,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     setDriverUpdateLocation,
     titleAccept,
     titleReject,
+    titleNotReady,
     appTitle,
   } = props;
 
@@ -302,7 +303,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                     textStyle={{ color: theme.colors.white }}
                     text={t('ORDER_NOT_READY', 'Order not ready')}
                     onClick={() =>
-                      handleChangeOrderStatus && handleChangeOrderStatus(14)
+                      handleViewActionOrder && handleViewActionOrder('notReady')
                     }
                     imgLeftStyle={{ tintColor: theme.colors.backArrow }}
                     bgColor={theme.colors.red}
@@ -344,6 +345,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                 actions={actions}
                 titleAccept={titleAccept}
                 titleReject={titleReject}
+                titleNotReady={titleNotReady}
                 appTitle={appTitle}
               />
             </OModal>

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

@@ -570,21 +570,25 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
             search={search}
             onSearch={setSearch}
           />
-          <OrdersOptionDelivery
-            {...props}
-            search={search}
-            onSearch={setSearch}
-          />
-          <OrdersOptionPaymethod
-            {...props}
-            search={search}
-            onSearch={setSearch}
-          />
-          <OrdersOptionDriver
-            {...props}
-            search={search}
-            onSearch={setSearch}
-          />
+          {isBusinessApp && (
+            <>
+              <OrdersOptionDelivery
+                {...props}
+                search={search}
+                onSearch={setSearch}
+              />
+              <OrdersOptionDriver
+                {...props}
+                search={search}
+                onSearch={setSearch}
+              />
+              <OrdersOptionPaymethod
+                {...props}
+                search={search}
+                onSearch={setSearch}
+              />
+            </>
+          )}
           <OButton
             text={t('SEARCH', 'Search')}
             textStyle={{ color: theme.colors.white }}