ordering-ui-react-native 0.21.79 → 0.21.81

package/package.json

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

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

@@ -16,7 +16,8 @@ import {
   useApi,
   useEvent,
   useLanguage,
-  useSession
+  useSession,
+  useConfig
 } from 'ordering-components/native'
 
 import { OIcon, OText } from '../shared'
@@ -95,9 +96,14 @@ const NewOrderNotificationUI = (props: any) => {
   const [events] = useEvent()
   const [{ user, token }] = useSession()
   const [ordering] = useApi()
+  const [{ configs }] = useConfig()
   const { getCurrentLocation } = useLocation()
   const [currentEvent, setCurrentEvent] = useState<any>(null)
 
+  const orderStatus = !!isBusinessApp
+    ? configs?.notification_business_states?.value.split('|').map((value: any) => Number(value)) || []
+    : configs?.notification_driver_states?.value.split('|').map((value: any) => Number(value)) || []
+
   const handleEventNotification = async (evtType: number, value: any) => {
     if (value?.driver) {
       try {
@@ -105,18 +111,26 @@ 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}` }
+          headers: {
+            'Content-Type': 'application/json',
+            Authorization: `Bearer ${token}`
+          }
         })
       } catch { }
       const duration = moment.duration(moment().diff(moment.utc(value?.last_driver_assigned_at)))
       const assignedSecondsDiff = duration.asSeconds()
-      if (assignedSecondsDiff < 5 && !isBusinessApp && !value?.logistic_status) {
+      if (assignedSecondsDiff < 5 && !isBusinessApp && !value?.logistic_status && orderStatus.includes(value.status)) {
         setCurrentEvent({ evt: 2, orderId: value?.id ?? value?.order_id })
       }
     }
-    if ((evtType === 3 && (value.status !== 8 || !value?.driver) && !value.uuid) || value?.author_id === user.id) return
+    if (!orderStatus.includes(value.status) || value?.author_id === user.id) return
     setCurrentEvent({
       evt: evtType,
       orderId: value?.driver

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

@@ -50,6 +50,7 @@ export const OrderHeaderComponent = (props: OrderHeader) => {
   const theme = useTheme();
   const [, t] = useLanguage();
   const [{ parseDate }] = useUtils();
+  const paymethodsLength = order?.payment_events?.filter((item: any) => item.event === 'payment')?.length
 
   const styles = StyleSheet.create({
     icons: {
@@ -120,6 +121,15 @@ export const OrderHeaderComponent = (props: OrderHeader) => {
           ? t('CURBSIDE', 'Curbside')
           : t('DRIVER_THRU', 'Driver thru')
 
+  const handlePaymethodsListString = () => {
+    const paymethodsList = order?.payment_events?.filter((item: any) => item.event === 'payment').map((paymethod: any) => {
+      return paymethod?.wallet_event
+        ? walletName[paymethod?.wallet_event?.wallet?.type]?.name
+        : t(paymethod?.paymethod?.gateway?.toUpperCase(), paymethod?.paymethod?.name)
+    })
+    return paymethodsList.join(', ')
+  }
+
   return (
     <>
       {!props.isCustomView && (
@@ -283,20 +293,10 @@ export const OrderHeaderComponent = (props: OrderHeader) => {
             )}
             <OText>
               <OText size={13} weight='bold'>
-                {`${t('PAYMENT_METHODS', 'Payment methods')}: `}
+                {`${t(paymethodsLength > 1 ? 'PAYMENT_METHODS' : 'PAYMENT_METHOD', paymethodsLength > 1 ? 'Payment methods' : 'Payment method')}: `}
               </OText>
               {order?.payment_events?.length > 0 ? (
-                <OText size={13}>
-                  {order?.payment_events?.map((event: any, idx: number) => {
-                    return event?.wallet_event
-                      ? idx < order?.payment_events?.length - 1
-                        ? `${walletName[event?.wallet_event?.wallet?.type]?.name} - `
-                        : walletName[event?.wallet_event?.wallet?.type]?.name
-                      : idx < order?.payment_events?.length - 1
-                        ? `${t(event?.paymethod?.name?.toUpperCase()?.replace(/ /g, '_'), event?.paymethod?.name)} - `
-                        : t(event?.paymethod?.name?.toUpperCase()?.replace(/ /g, '_'), event?.paymethod?.name)
-                  })}
-                </OText>
+                <OText size={13}>{`${handlePaymethodsListString()}`}</OText>
               ) : (
                 <OText size={13}>{t(order?.paymethod?.gateway?.toUpperCase(), order?.paymethod?.name)}</OText>
               )}