ordering-ui-react-native 0.15.16 → 0.15.18-release

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

@@ -1,18 +1,66 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { StyleSheet, View, Dimensions, Platform } from 'react-native';
-import { useLanguage } from 'ordering-components/native';
+import { useForm, Controller } from 'react-hook-form';
+import { useLanguage, useApi } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
-import { LogoWrapper, Container, BackgroundImage } from './styles';
-import { OButton, OIcon, OText } from '../shared';
+import { LogoWrapper, Container, BackgroundImage, FormInput } from './styles';
+import { OButton, OIcon, OText, OInput } from '../shared';
 import { _setStoreData } from '../../providers/StoreUtil';
 
 export const Home = (props: any) => {
-  const { onNavigationRedirect } = props;
+  const { onNavigationRedirect, useRootPoint } = props;
   const safeHeight = Platform.OS === 'ios' ? 80 : 40;
 
   const theme = useTheme();
+  const [ordering, { setOrdering }] = useApi();
   const [, t] = useLanguage();
+  const { control, handleSubmit, errors } = useForm();
 
+
+  const styles = StyleSheet.create({
+    logo: {
+      height: 65,
+      width: 300,
+    },
+    wrapperContent: {
+      width: '100%',
+    },
+    wrapperText: {
+      marginBottom: 20,
+    },
+    textTitle: {
+      fontWeight: '600',
+      fontStyle: 'normal',
+      fontSize: 50,
+    },
+    textSubtitle: {
+      fontWeight: 'normal',
+      fontStyle: 'normal',
+      fontSize: 14,
+    },
+    wrapperBtn: {
+      marginBottom: 20
+    },
+    btn: {
+      borderRadius: 7.6,
+      marginTop: 20,
+    },
+    btnText: {
+      fontFamily: 'Poppins',
+      fontStyle: 'normal',
+      fontWeight: 'normal',
+      fontSize: 18,
+    },
+    input: {
+      borderWidth: 1,
+      borderRadius: 7.6,
+      borderColor: Object.keys(errors).length > 0 ? theme.colors.error : theme.colors.inputSignup,
+      backgroundColor: theme.colors.transparent,
+    },
+  });
+
+  const [projectName, setProjectName] = useState<any>(null)
+  const [isLoadingProject, setLoadingProject] = useState(false)
   const [orientation, setOrientation] = useState(
     Dimensions.get('window').width < Dimensions.get('window').height
       ? 'Portrait'
@@ -34,6 +82,27 @@ export const Home = (props: any) => {
     }
   });
 
+  const onSubmit = (values: any) => {
+    setLoadingProject(true)
+    setProjectName(values)
+    setOrdering({ ...ordering, project: values?.project_name })
+    _setStoreData('project_name', values?.project_name)
+  };
+
+  useEffect(() => {
+    if (Object.keys(errors).length > 0) {
+      setProjectName(null)
+      setLoadingProject(false)
+    }
+  }, [errors])
+
+  useEffect(() => {
+    if (ordering?.project === projectName?.project_name) {
+      setLoadingProject(false)
+      onNavigationRedirect('Login')
+    }
+  }, [ordering])
+
   return (
     <Container height={windowHeight - safeHeight} orientation={orientation}>
       <BackgroundImage
@@ -54,58 +123,62 @@ export const Home = (props: any) => {
             </OText>
           </View>
 
-          <View style={styles.wrapperBtn}>
-            <OButton
-              text={t('LOGIN', 'Login')}
-              textStyle={{
-                ...styles.btnText,
-                color: theme.colors.inputTextColor,
-              }}
-              bgColor={theme.colors.primary}
-              borderColor={theme.colors.primary}
-              style={styles.btn}
-              imgRightSrc={false}
-              onClick={() => onNavigationRedirect('Login')}
-            />
-          </View>
+          <>
+            {useRootPoint && (
+              <FormInput>
+                <Controller
+                  control={control}
+                  name='project_name'
+                  rules={{ required: t(`VALIDATION_ERROR_PROJECT_NAME_REQUIRED`, 'The field project name is required') }}
+                  defaultValue=""
+                  render={({ onChange, value }: any) => (
+                    <OInput
+                      name='project_name'
+                      placeholderTextColor={theme.colors.arrowColor}
+                      placeholder={t('PROJECT_NAME', 'Project Name')}
+                      icon={theme.images.general.project}
+                      iconColor={theme.colors.arrowColor}
+                      onChange={(e: any) => onChange(e?.target?.value)}
+                      selectionColor={theme.colors.primary}
+                      color={theme.colors.white}
+                      value={value}
+                      style={styles.input}
+                      returnKeyType='done'
+                      autoCorrect={false}
+                      autoCapitalize='none'
+                      blurOnSubmit={false}
+                      onSubmitEditing={() => handleSubmit(onSubmit)()}
+                    />
+                  )}
+                />
+              </FormInput>
+            )}
+            {Object.keys(errors).length > 0 && (
+              <OText
+                color={theme.colors.white}
+                style={{ alignSelf: 'center', marginTop: 5 }}
+              >
+                {errors['project_name'].message}
+              </OText>
+            )}
+            <View style={styles.wrapperBtn}>
+              <OButton
+                text={useRootPoint ? t('SET_PROJECT', 'Set project') : t('LOGIN', 'Login')}
+                textStyle={{
+                  ...styles.btnText,
+                  color: theme.colors.inputTextColor,
+                }}
+                bgColor={theme.colors.primary}
+                borderColor={theme.colors.primary}
+                isLoading={isLoadingProject}
+                style={styles.btn}
+                imgRightSrc={false}
+                onClick={() => useRootPoint ? handleSubmit(onSubmit)() : onNavigationRedirect('Login')}
+              />
+            </View>
+          </>
         </View>
       </BackgroundImage>
     </Container>
   );
 };
-
-const styles = StyleSheet.create({
-  logo: {
-    height: 65,
-    width: 300,
-  },
-  wrapperContent: {
-    width: '100%',
-  },
-  wrapperText: {
-    marginBottom: 20,
-  },
-  textTitle: {
-    fontWeight: '600',
-    fontStyle: 'normal',
-    fontSize: 50,
-  },
-  textSubtitle: {
-    fontWeight: 'normal',
-    fontStyle: 'normal',
-    fontSize: 14,
-  },
-  wrapperBtn: {
-    marginBottom: 20,
-  },
-  btn: {
-    borderRadius: 7.6,
-    marginTop: 20,
-  },
-  btnText: {
-    fontFamily: 'Poppins',
-    fontStyle: 'normal',
-    fontWeight: 'normal',
-    fontSize: 18,
-  },
-});

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

@@ -1,4 +1,4 @@
-import styled from 'styled-components/native';
+import styled, { css } from 'styled-components/native';
 
 export const Container = styled.View`
   width: 100%;
@@ -25,3 +25,10 @@ export const BackgroundImage = styled.ImageBackground`
   align-items: center;
   padding: 20px 40px;
 `;
+
+export const FormInput = styled.View`
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  min-height: 50px;
+`;

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

@@ -1,50 +1,55 @@
-import React, { useState, useEffect, useCallback } from 'react'
-import { useEvent, useLanguage, useUtils, useSession, useApi, NewOrderNotification as NewOrderNotificationController } from 'ordering-components/native'
+import React, { useState, useEffect } from 'react'
+import moment from 'moment'
 import { View, Modal, StyleSheet, TouchableOpacity, Dimensions } from 'react-native'
-import { OText, OIcon } from '../shared'
-import { useTheme } from 'styled-components/native'
+import Sound from 'react-native-sound'
 import Icon from 'react-native-vector-icons/Feather'
+import { useTheme } from 'styled-components/native'
+import { useEvent, useLanguage, useSession, useApi, NewOrderNotification as NewOrderNotificationController } from 'ordering-components/native'
+
+import { OText, OIcon } from '../shared'
 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
 
-const NewOrderNotificationUI = (props: any) => {
+const NewOrderNotificationUI = () => {
   const [events] = useEvent()
   const theme = useTheme()
   const [, t] = useLanguage()
   const [{ user, token }] = useSession()
   const [ordering] = useApi()
-  const [{ getTimeAgo }] = useUtils()
   const { getCurrentLocation } = useLocation();
-  const [modalOpen, setModalOpen] = useState(false)
-  const [newOrderId, setNewOrderId] = useState(null)
-  const [messageOrderId, setMessageOrderId] = useState(null)
   const [soundTimeout, setSoundTimeout] = useState<any>(null)
-  const [isFocused, setIsFocused] = useState(false)
-  const [currentChange, setCurrentChange] = useState(1)
+  const [currentEvent, setCurrentEvent] = useState<any>(null)
+
+  const evtList: any = {
+    1: {
+      event: 'messages',
+      message: t('NEW_MESSAGES_RECEIVED', 'New messages have been received!'),
+      message2: t('ORDER_N_UNREAD_MESSAGES', 'Order #_order_id_ has unread messages.').replace('_order_id_', currentEvent?.orderId),
+    },
+    2: {
+      event: 'order_added',
+      message: t('NEW_ORDERS_RECEIVED', 'New orders have been received!'),
+      message2: t('ORDER_N_ORDERED', 'Order #_order_id_ has been ordered.').replace('_order_id_', currentEvent?.orderId),
+    },
+    3: {
+      event: 'order_updated',
+      message: t('NEW_ORDERS_UPDATED', 'New orders have been updated!'),
+      message2: t('ORDER_N_UPDATED', 'Order #_order_id_ has been updated.').replace('_order_id_', currentEvent?.orderId),
+    },
+  }
 
-  const notificationSound = new Sound(theme.sounds.notification, error => {
-    if (error) {
-      console.log('failed to load the sound', error);
-      return
-    }
-    console.log('loaded successfully');
-  });
+  const notificationSound = new Sound(theme.sounds.notification, (e) => { console.log(e) });
 
   const handlePlayNotificationSound = () => {
     let times = 0
     const _timeout = setInterval(function () {
       notificationSound.play(success => {
         if (success) {
-          console.log('successfully finished playing');
           times = times + 1
-        } else {
-          console.log('playback failed due to audio decoding errors');
         }
       })
       setSoundTimeout(_timeout)
@@ -57,39 +62,11 @@ const NewOrderNotificationUI = (props: any) => {
 
   const handleCloseModal = () => {
     clearInterval(soundTimeout)
-    setModalOpen(false)
-    setNewOrderId(null)
-    setMessageOrderId(null)
-  }
-
-  const handleNotification = (order: any) => {
-    setModalOpen(true)
-    clearInterval(soundTimeout)
-    setCurrentChange(1)
-    handlePlayNotificationSound()
-    setNewOrderId(order.id)
-  }
-
-  const handleMessageNotification = (message: any) => {
-    const { order_id: orderId } = message;
-    if (!modalOpen) setModalOpen(true)
-    clearInterval(soundTimeout)
-    setCurrentChange(2)
-    handlePlayNotificationSound()
-    setMessageOrderId(orderId)
+    setCurrentEvent({ evt: null })
   }
 
-  useEffect(() => {
-    events.on('order_added_noification', handleNotification)
-    events.on('message_added_noification', handleMessageNotification)
-    return () => {
-      events.off('order_added_noification', handleNotification)
-      events.off('message_added_noification', handleMessageNotification)
-    }
-  }, [])
-
-  const handleUpdateOrder = useCallback(async (order: any) => {
-    if (order?.driver) {
+  const handleEventNotification = async (evtType: number, value: any) => {
+    if (value?.driver) {
       const location = await getCurrentLocation()
       await fetch(`${ordering.root}/users/${user.id}/locations`, {
         method: 'POST',
@@ -98,25 +75,32 @@ const NewOrderNotificationUI = (props: any) => {
         }),
         headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` }
       })
-      const assignedTimeDiff = moment.utc(order?.driver?.last_order_assigned_at).local().fromNow()
+      const assignedTimeDiff = moment.utc(value?.driver?.last_order_assigned_at).local().fromNow()
       if (assignedTimeDiff === 'a few seconds ago') {
-        clearInterval(soundTimeout)
         handlePlayNotificationSound()
-        setNewOrderId(order.id)
-        if(isFocused){
-          setModalOpen(true)
-        }
+        clearInterval(soundTimeout)
+        setCurrentEvent({ evt: 2, orderId: value?.id })
       }
+      return
     }
-  }, [newOrderId, notificationSound, soundTimeout])
+    handlePlayNotificationSound()
+    clearInterval(soundTimeout)
+    setCurrentEvent({
+      evt: evtType,
+      orderId: evtList[evtType].event === 'messages' ? value?.order_id : value?.id
+    })
+  }
 
   useEffect(() => {
-    if (user?.level !== 4) return
-    events.on('order_updated_noification', handleUpdateOrder)
+    events.on('message_added_notification', (o: any) => handleEventNotification(1, o))
+    events.on('order_added_notification', (o: any) => handleEventNotification(2, o))
+    events.on('order_updated_notification', (o: any) => handleEventNotification(3, o))
     return () => {
-      events.off('order_updated_noification', handleUpdateOrder)
+      events.off('message_added_notification', (o: any) => handleEventNotification(1, o))
+      events.off('order_added_notification', (o: any) => handleEventNotification(2, o))
+      events.off('order_updated_notification', (o: any) => handleEventNotification(3, o))
     }
-  }, [handleUpdateOrder, user])
+  }, [])
 
   useEffect(() => {
     notificationSound.setVolume(1);
@@ -125,21 +109,12 @@ const NewOrderNotificationUI = (props: any) => {
     }
   }, [])
 
-  useFocusEffect(
-    useCallback(() => {
-      setIsFocused(true)
-      return () => {
-        setIsFocused(false)
-      }
-    }, [])
-  )
-
   return (
     <>
       <Modal
         animationType='slide'
         transparent={true}
-        visible={modalOpen}
+        visible={!!currentEvent?.orderId}
       >
         <NotificationContainer>
           <View style={styles.modalView}>
@@ -147,40 +122,26 @@ const NewOrderNotificationUI = (props: any) => {
               style={styles.wrapperIcon}
               onPress={() => handleCloseModal()}
             >
-              <Icon
-                name="x"
-                size={30}
-              />
+              <Icon name="x" size={30} />
             </TouchableOpacity>
             <OText
               size={18}
               color={theme.colors.textGray}
               weight={600}
             >
-              {currentChange === 1 ? t('NEW_ORDRES_RECEIVED', 'New orders have been received!') : t('NEW_MESSAGES_RECEIVED', 'New messages have been received!')}
+              {evtList[currentEvent?.evt]?.message}
             </OText>
             <OIcon
               src={theme.images.general.newOrder}
               width={250}
               height={200}
             />
-            {newOrderId !== null && (
-              <OText
-                color={theme.colors.textGray}
-                mBottom={15}
-              >
-                {t('ORDER_N_ORDERED', 'Order #_order_id_ has been ordered.').replace('_order_id_', newOrderId)}
-              </OText>
-            )}
-
-            {messageOrderId  !== null && (
-              <OText
-                color={theme.colors.textGray}
-                mBottom={15}
-              >
-                {t('ORDER_N_UNREAD_MESSAGES', 'Order #_order_id_ has unread messages.').replace('_order_id_', messageOrderId)}
-              </OText>
-            )}
+            <OText
+              color={theme.colors.textGray}
+              mBottom={15}
+            >
+              {evtList[currentEvent?.evt]?.message2}
+            </OText>
           </View>
         </NotificationContainer>
       </Modal>

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

@@ -335,7 +335,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
         addressName: order?.business?.address,
         zipcode: order?.business?.zipcode
       },
-      icon: order?.business?.logo || theme.images.dummies.businessLogo,
+      icon: order?.business?.logo || 'https://res.cloudinary.com/demo/image/fetch/c_thumb,g_face,r_max/https://res.cloudinary.com/ordering2/image/upload/v1654619525/hzegwosnplvrbtjkpfi6.png',
       level: 2,
     },
     {
@@ -431,6 +431,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
             handleViewSummaryOrder={handleViewSummaryOrder}
             handleCopyClipboard={handleCopyClipboard}
             handleArrowBack={handleArrowBack}
+            isCustomView={props.isCustomView}
           />
           <OrderDetailsContainer
             keyboardShouldPersistTaps="handled"

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

@@ -51,7 +51,8 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     orderTitle,
     appTitle,
     handleClickLogisticOrder,
-    forceUpdate
+    forceUpdate,
+    getPermissions
   } = props;
   const [, { showToast }] = useToast();
   const { order } = props.order
@@ -72,6 +73,8 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     key?: string | null;
   }>({ open: false, content: [], key: null });
 
+  const validStatusComplete = [9, 19, 23]
+
   const logisticOrderStatus = [4, 6, 7]
 
   const showFloatButtonsPickUp: any = {
@@ -101,9 +104,14 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   };
 
   const handleOpenMapView = async () => {
-    if (permissions.locationStatus === 'granted') {
+    const _permissions = await getPermissions()
+
+    const isBlocked = _permissions.some((_permission: string) => permissions?.locationStatus?.[_permission] === 'blocked')
+    const isGranted = _permissions.reduce((allPermissions: boolean, _permission: string) => allPermissions && permissions?.locationStatus?.[_permission] === 'granted', true)
+
+    if (isGranted) {
       setOpenModalForMapView(!openModalForMapView);
-    } else if (permissions.locationStatus === 'blocked') {
+    } else if (isBlocked) {
       // redirectToSettings();
       showToast(
         ToastType.Error,
@@ -114,8 +122,9 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
       );
     } else {
       const response = await askLocationPermission();
-      if (response === 'granted') {
-        setOpenModalForMapView(!openModalForMapView);
+      const isGranted = _permissions.reduce((allPermissions: boolean, _permission: string) => allPermissions && response?.locationStatus?.[_permission] === 'granted', true)
+      if (isGranted) {
+        setOpenModalForMapView(true)
       }
     }
   };
@@ -141,9 +150,9 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     handleArrowBack()
   }
 
-  const handleAcceptLogisticOrder = (order : any) => {
+  const handleAcceptLogisticOrder = (order: any) => {
     handleClickLogisticOrder?.(1, order?.logistic_order_id)
-    if(order?.order_group){
+    if (order?.order_group) {
       handleArrowBack()
     }
   }
@@ -166,10 +175,10 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   ];
 
   useEffect(() => {
-    if (permissions.locationStatus !== 'granted' && openModalForMapView) {
+    if (permissions?.locationStatus !== 'granted' && openModalForMapView) {
       setOpenModalForMapView(false);
     }
-  }, [permissions.locationStatus]);
+  }, [permissions?.locationStatus]);
 
   useEffect(() => {
     if (openModalForAccept) {
@@ -215,8 +224,8 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   }, [messagesReadList]);
 
   useEffect(() => {
-    forceUpdate && handleViewActionOrder && handleViewActionOrder(forceUpdate === 9 ? 'forcePickUp': 'forceDelivery')
-  },[forceUpdate])
+    forceUpdate && handleViewActionOrder && handleViewActionOrder(forceUpdate === 9 ? 'forcePickUp' : 'forceDelivery')
+  }, [forceUpdate])
 
   const styles = StyleSheet.create({
     btnPickUp: {
@@ -254,7 +263,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     );
   }
 
-  const OrderDetailsInformation = (props : {order: any, isOrderGroup?: boolean, lastOrder?: boolean}) => {
+  const OrderDetailsInformation = (props: { order: any, isOrderGroup?: boolean, lastOrder?: boolean }) => {
     const {
       order,
       isOrderGroup,
@@ -378,7 +387,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                     widthButton={'45%'}
                   />
                 )}
-                {(order?.status === 9 || order?.status === 19) && (
+                {(validStatusComplete.includes(order?.status)) && (
                   <>
                     <FloatingButton
                       disabled={props.order?.loading}