ordering-ui-react-native 0.17.89 → 0.17.90-release

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

@@ -2,20 +2,17 @@ import React, { useState, useEffect } from 'react';
 import {
   View,
   Pressable,
-  StyleSheet,
-  Dimensions,
-  ScrollView,
-  RefreshControl,
+  StyleSheet
 } from 'react-native';
 import { Contacts, useLanguage } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
-import { Placeholder, PlaceholderLine, Fade } from 'rn-placeholder';
-import { OText, OButton } from '../shared';
+import { OText } from '../shared';
 import { NotFoundSource } from '../NotFoundSource';
 import { PreviousMessages } from '../PreviousMessages';
 import { FiltersTab, TabsContainer, TagsContainer, Tag } from './styles';
 import { MessagesOptionParams } from '../../types';
 import { useDeviceOrientation } from '../../../../../src/hooks/DeviceOrientation';
+
 const MessagesOptionUI = (props: MessagesOptionParams) => {
   const {
     orders,
@@ -65,12 +62,6 @@ const MessagesOptionUI = (props: MessagesOptionParams) => {
     ),
   );
 
-  const [orientation, setOrientation] = useState(
-    Dimensions.get('window').width < Dimensions.get('window').height
-      ? 'Portrait'
-      : 'Landscape',
-  );
-
   const getTagFilter = (key: number) => {
     return tags.find(value => value.key === key)?.text;
   };
@@ -114,14 +105,6 @@ const MessagesOptionUI = (props: MessagesOptionParams) => {
     );
   }, [orders]);
 
-  Dimensions.addEventListener('change', ({ window: { width, height } }) => {
-    if (width < height) {
-      setOrientation('Portrait');
-    } else {
-      setOrientation('Landscape');
-    }
-  });
-
   const styles = StyleSheet.create({
     header: {
       marginBottom: 25,
@@ -242,35 +225,28 @@ const MessagesOptionUI = (props: MessagesOptionParams) => {
             !error
               ? t('NO_RESULTS_FOUND', 'Sorry, no results found')
               : error[0]?.message ||
-                error[0] ||
-                t('NETWORK_ERROR', 'Network Error')
+              error[0] ||
+              t('NETWORK_ERROR', 'Network Error')
           }
           image={theme.images.general.notFound}
           conditioned={false}
         />
       )}
-
-      <ScrollView 
-        showsVerticalScrollIndicator={false}
-        style={{ flex: 1 }}
-        refreshControl={<RefreshControl
-          refreshing={refreshing}
-          onRefresh={() => getOrders?.()}
-      />}
-      >
-        {!reload &&
-          !error &&
-          values.length > 0 &&
-          JSON.stringify(tabsFilter) === JSON.stringify(tabs[0].tags) && (
-            <PreviousMessages
-              orders={values}
-              setOrders={setOrders}
-              messages={messages}
-              onNavigationRedirect={onNavigationRedirect}
-            />
-          )}
-
-        {/* {!reload &&
+      <PreviousMessages
+        orders={values}
+        messages={messages}
+        onNavigationRedirect={onNavigationRedirect}
+        getOrders={getOrders}
+        pagination={pagination}
+        loading={loading}
+        reload={reload}
+        tabs={tabs}
+        tabsFilter={tabsFilter}
+        setOrders={setOrders}
+        loadMore={loadMore}
+        error={error}
+      />
+      {/* {!reload &&
         !error &&
         orders.length > 0 &&
         JSON.stringify(tabsFilter) === JSON.stringify(tabs[1].tags) && (
@@ -283,55 +259,6 @@ const MessagesOptionUI = (props: MessagesOptionParams) => {
             onNavigationRedirect={onNavigationRedirect}
           />
         )} */}
-
-        {(loading || reload) && (
-          <>
-            <View>
-              {[...Array(5)].map((item, i) => (
-                <Placeholder key={i} Animation={Fade}>
-                  <View
-                    style={{
-                      width: '100%',
-                      flexDirection: 'row',
-                      marginBottom: 10,
-                    }}>
-                    <PlaceholderLine
-                      width={orientation === 'Portrait' ? 22 : 11}
-                      height={74}
-                      style={{
-                        marginRight: 20,
-                        marginBottom: 20,
-                        borderRadius: 7.6,
-                      }}
-                    />
-                    <Placeholder>
-                      <PlaceholderLine width={30} style={{ marginTop: 5 }} />
-                      <PlaceholderLine width={50} />
-                      <PlaceholderLine width={20} />
-                    </Placeholder>
-                  </View>
-                </Placeholder>
-              ))}
-            </View>
-          </>
-        )}
-
-        {pagination?.totalPages &&
-          !loading &&
-          !reload &&
-          JSON.stringify(tabsFilter) === JSON.stringify(tabs[0].tags) &&
-          pagination?.currentPage < pagination?.totalPages && (
-            <OButton
-              onClick={() => loadMore && loadMore()}
-              text={t('LOAD_MORE_ORDERS', 'Load more orders')}
-              imgRightSrc={null}
-              textStyle={styles.loadButtonText}
-              style={styles.loadButton}
-              bgColor={theme.colors.primary}
-              borderColor={theme.colors.primary}
-            />
-          )}
-      </ScrollView>
     </>
   );
 };

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

@@ -1,71 +1,102 @@
-import React, { useState, useEffect } from 'react'
+import React, { useEffect, useState } from 'react';
+import {
+  Modal,
+  View,
+  StyleSheet,
+  Dimensions,
+  TouchableOpacity
+} from 'react-native';
+import { useTheme } from 'styled-components/native'
 import moment from 'moment'
-import { View, Modal, StyleSheet, TouchableOpacity, Dimensions } from 'react-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 SoundPlayer from 'react-native-sound-player'
 
-import { OText, OIcon } from '../shared'
+import {
+  NewOrderNotification as NewOrderNotificationController,
+  useApi,
+  useEvent,
+  useLanguage,
+  useSession
+} from 'ordering-components/native'
+
+import { OIcon, OText } from '../shared'
 import { NotificationContainer } from './styles'
 import { useLocation } from '../../hooks/useLocation'
 
-Sound.setCategory('Playback')
-
+const DELAY_SOUND = 2500 // 2 sec
 const windowWidth = Dimensions.get('screen').width
 
-const SOUND_LOOP = 3
+const SoundPlayerComponent = (props: any) => {
+  const { evtList, currentEvent, handleCloseEvents } = props
 
-const NewOrderNotificationUI = (props: any) => {
-  const { isBusinessApp } = props
-  const [events] = useEvent()
   const theme = useTheme()
-  const [, t] = useLanguage()
-  const [{ user, token }] = useSession()
-  const [ordering] = useApi()
-  const { getCurrentLocation } = useLocation();
-  const [currentEvent, setCurrentEvent] = useState<any>(null)
+  const [count, setCount] = useState(0);
 
-  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 URL_SOUND = 'https://d33aymufw4jvwf.cloudfront.net/notification.mp3' ?? theme.sounds.notification
 
-  const notificationSound = new Sound(theme.sounds.notification);
+  useEffect(() => {
+    const id = setInterval(() => setCount(count + 1), 2500)
 
-  let _timeout: any = null
+    const playSound = async () => {
+      SoundPlayer.playUrl(URL_SOUND)
+      await new Promise(resolve => setTimeout(resolve, DELAY_SOUND))
+      SoundPlayer.stop()
+    }
 
-  const handleCloseEvents = () => {
-    notificationSound.stop()
-    setCurrentEvent(null)
-    clearInterval(_timeout)
-  }
+    playSound()
 
-  const handlePlayNotificationSound = (eventObj: any = null) => {
-    setCurrentEvent(eventObj)
-    let times = 1
-    if (times < SOUND_LOOP) {
-      _timeout = setInterval(() => {
-        notificationSound.setVolume(1).play(success => success && (times = times + 1))
-        if (times === SOUND_LOOP) {
-          clearInterval(_timeout)
-        }
-      }, 2500)
+    return () => {
+      SoundPlayer.stop()
+      clearInterval(id);
     }
-  }
+  }, [count])
+
+  return (
+    <Modal
+      animationType='slide'
+      transparent={true}
+      visible={!!currentEvent?.orderId}
+    >
+      <NotificationContainer>
+        <View style={styles.modalView}>
+          <TouchableOpacity
+            style={styles.wrapperIcon}
+            onPress={() => handleCloseEvents()}
+          >
+            <Icon name="x" size={30} />
+          </TouchableOpacity>
+          <OText
+            size={18}
+            color={theme.colors.textGray}
+            weight={600}
+          >
+            {evtList(currentEvent)[currentEvent?.evt]?.message}
+          </OText>
+          <OIcon
+            src={theme.images.general.newOrder}
+            width={250}
+            height={200}
+          />
+          <OText
+            color={theme.colors.textGray}
+            mBottom={15}
+          >
+            {evtList(currentEvent)[currentEvent?.evt]?.message2}
+          </OText>
+        </View>
+      </NotificationContainer>
+    </Modal>
+  )
+}
+
+const NewOrderNotificationUI = (props: any) => {
+  const { isBusinessApp, evtList } = props
+
+  const [events] = useEvent()
+  const [{ user, token }] = useSession()
+  const [ordering] = useApi()
+  const { getCurrentLocation } = useLocation()
+  const [currentEvent, setCurrentEvent] = useState<any>(null)
 
   const handleEventNotification = async (evtType: number, value: any) => {
     if (value?.driver) {
@@ -74,21 +105,25 @@ const NewOrderNotificationUI = (props: any) => {
         await fetch(`${ordering.root}/users/${user.id}/locations`, {
           method: 'POST',
           body: JSON.stringify({
-            location: JSON.stringify({location: `{lat: ${location.latitude}, lng: ${location.longitude}}`})
+            location: JSON.stringify({ location: `{lat: ${location.latitude}, lng: ${location.longitude}}` })
           }),
           headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` }
         })
-      } catch {}
+      } catch { }
       const duration = moment.duration(moment().diff(moment.utc(value?.last_driver_assigned_at)))
       const assignedSecondsDiff = duration.asSeconds()
-      if (assignedSecondsDiff < 5 && !isBusinessApp) {
-        handlePlayNotificationSound({ evt: 2, orderId: value?.id })
+      if (assignedSecondsDiff < 5 && !isBusinessApp && !value?.logistic_status) {
+        setCurrentEvent({ evt: 2, orderId: value?.id })
       }
     }
-    if (evtType === 3 || value.author_id === user.id) return
-    handlePlayNotificationSound({
+    if (evtType === 3 || value?.author_id === user.id) return
+    setCurrentEvent({
       evt: evtType,
-      orderId: evtList[evtType].event === 'messages' ? value?.order_id : value?.id
+      orderId: value?.driver
+        ? value?.order_id
+        : evtList(currentEvent)[evtType].event === 'messages'
+          ? value?.order?.id
+          : value?.order_id ?? value?.id
     })
   }
 
@@ -109,48 +144,21 @@ const NewOrderNotificationUI = (props: any) => {
   }, [])
 
   useEffect(() => {
-    return () => handleCloseEvents()
+    return () => setCurrentEvent(null)
   }, [])
 
   return (
     <>
-      <Modal
-        animationType='slide'
-        transparent={true}
-        visible={!!currentEvent?.orderId}
-      >
-        <NotificationContainer>
-          <View style={styles.modalView}>
-            <TouchableOpacity
-              style={styles.wrapperIcon}
-              onPress={() => handleCloseEvents()}
-            >
-              <Icon name="x" size={30} />
-            </TouchableOpacity>
-            <OText
-              size={18}
-              color={theme.colors.textGray}
-              weight={600}
-            >
-              {evtList[currentEvent?.evt]?.message}
-            </OText>
-            <OIcon
-              src={theme.images.general.newOrder}
-              width={250}
-              height={200}
-            />
-            <OText
-              color={theme.colors.textGray}
-              mBottom={15}
-            >
-              {evtList[currentEvent?.evt]?.message2}
-            </OText>
-          </View>
-        </NotificationContainer>
-      </Modal>
+      {!!currentEvent ? (
+        <SoundPlayerComponent
+          evtList={evtList}
+          currentEvent={currentEvent}
+          handleCloseEvents={() => setCurrentEvent(null)}
+        />
+      ) : null}
     </>
   )
-}
+};
 
 const styles = StyleSheet.create({
   modalView: {
@@ -170,9 +178,28 @@ const styles = StyleSheet.create({
 })
 
 export const NewOrderNotification = (props: any) => {
+  const [, t] = useLanguage()
+
   const newOrderNotificationProps = {
     ...props,
-    UIComponent: NewOrderNotificationUI
+    UIComponent: NewOrderNotificationUI,
+    evtList: (currentEvent: 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),
+      },
+    })
   };
 
   return <NewOrderNotificationController {...newOrderNotificationProps} />;

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

@@ -18,7 +18,7 @@ export const NotFoundSource = (props: NotFoundSourceParams) => {
           <OIcon src={errorImage} width={260} height={220} />
         </NotFoundImage>
       )}
-      {content && conditioned && !errorImage && (
+      {!!content && conditioned && !errorImage && (
         <OText
           color={theme.colors.textSecondary}
           size={textSize ?? 18}
@@ -26,7 +26,7 @@ export const NotFoundSource = (props: NotFoundSourceParams) => {
           {content}
         </OText>
       )}
-      {content && !conditioned && (
+      {!!content && !conditioned && (
         <OText
           color={theme.colors.textSecondary}
           size={textSize ?? 18}

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

@@ -410,7 +410,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
           </View>
         )}
 
-      {(!!error || error) && (
+      {(!!error || error?.length > 0) && (
         <NotFoundSource
           btnTitle={t('GO_TO_MY_ORDERS', 'Go to my orders')}
           content={